[PATCH] Corosync configuration in /etc/corosync
Jan Friesse
jfriesse at redhat.com
Thu Jun 11 08:29:06 PDT 2009
---
trunk/configure.ac | 2 +-
trunk/exec/coroparse.c | 2 +-
trunk/exec/totemconfig.c | 2 +-
trunk/tools/corosync-keygen.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/trunk/configure.ac b/trunk/configure.ac
index d0f5432..52902e8 100644
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -24,7 +24,7 @@ if test "$prefix" = "NONE"; then
fi
dnl Fix "sysconfdir" variable if not specified
if test "$sysconfdir" = "\${prefix}/etc"; then
- sysconfdir="/etc"
+ sysconfdir="/etc/corosync"
fi
dnl Fix "libdir" variable if not specified
if test "$libdir" = "\${exec_prefix}/lib"; then
diff --git a/trunk/exec/coroparse.c b/trunk/exec/coroparse.c
index 0891917..edf3146 100644
--- a/trunk/exec/coroparse.c
+++ b/trunk/exec/coroparse.c
@@ -219,7 +219,7 @@ static int read_uidgid_files_into_objdb(
int res = 0;
struct stat stat_buf;
- dirname = SYSCONFDIR "/corosync/uidgid.d";
+ dirname = SYSCONFDIR "/uidgid.d";
dp = opendir (dirname);
if (dp == NULL)
diff --git a/trunk/exec/totemconfig.c b/trunk/exec/totemconfig.c
index f500708..69bc184 100644
--- a/trunk/exec/totemconfig.c
+++ b/trunk/exec/totemconfig.c
@@ -764,7 +764,7 @@ int totem_config_keyread (
if (!got_key) {
const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
if (!filename)
- filename = SYSCONFDIR "/ais/authkey";
+ filename = SYSCONFDIR "/authkey";
res = read_keyfile(filename, totem_config, error_string);
if (res)
goto key_error;
diff --git a/trunk/tools/corosync-keygen.c b/trunk/tools/corosync-keygen.c
index c7f2e2e..50512dd 100644
--- a/trunk/tools/corosync-keygen.c
+++ b/trunk/tools/corosync-keygen.c
@@ -44,7 +44,7 @@
#include <netinet/in.h>
-#define KEYFILE SYSCONFDIR "/ais/authkey"
+#define KEYFILE SYSCONFDIR "/authkey"
int main (void) {
int authkey_fd;
@@ -57,7 +57,7 @@ int main (void) {
printf ("Error: Authorization key must be generated as root user.\n");
exit (1);
}
- if (mkdir (SYSCONFDIR "/ais", 0700)) {
+ if (mkdir (SYSCONFDIR, 0700)) {
if (errno != EEXIST) {
perror ("Failed to create directory: " SYSCONFDIR "/ais");
exit (1);
--
1.5.5.6
--------------010904060601050505060802--
More information about the Openais
mailing list