[Cluster-devel] cluster/fence/agents/xvm fence_xvm.c

[Cluster-devel] cluster/fence/agents/xvm fence_xvm.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-03-06 15:30:11

Modified files:
	fence/agents/xvm: fence_xvm.c 

Log message:
	Resolves: 231149
	Enable auto-fallback to no-authentication for fence_xvm if fence_xvm.key does not exist.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvm.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.4.2.1&r2=1.4.2.2

--- cluster/fence/agents/xvm/fence_xvm.c	2006/12/01 15:49:38	1.4.2.1
+++ cluster/fence/agents/xvm/fence_xvm.c	2007/03/06 15:30:11	1.4.2.2
@@ -223,8 +223,10 @@
 	if (args->auth != AUTH_NONE || args->hash != HASH_NONE) {
 		key_len = read_key_file(args->key_file, key, sizeof(key));
 		if (key_len < 0) {
-			printf("Could not read key file\n");
-			return 1;
+			printf("Could not read %s; trying without "
+			       "authentication\n", args->key_file);
+			args->auth = AUTH_NONE;
+			args->hash = HASH_NONE;
 		}
 	}
 

[Cluster-devel] cluster/fence/agents/xvm fence_xvm.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-03-06 15:32:22

Modified files:
	fence/agents/xvm: fence_xvm.c 

Log message:
	Resolves: 231151
	Enable auto-fallback to no-authentication for fence_xvm if fence_xvm.key does not exist.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvm.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.1&r2=1.3.2.2

--- cluster/fence/agents/xvm/fence_xvm.c	2006/11/13 16:14:06	1.3.2.1
+++ cluster/fence/agents/xvm/fence_xvm.c	2007/03/06 15:32:22	1.3.2.2
@@ -223,8 +223,10 @@
 	if (args->auth != AUTH_NONE || args->hash != HASH_NONE) {
 		key_len = read_key_file(args->key_file, key, sizeof(key));
 		if (key_len < 0) {
-			printf("Could not read key file\n");
-			return 1;
+			printf("Could not read %s; trying without "
+			       "authentication\n", args->key_file);
+			args->auth = AUTH_NONE;
+			args->hash = HASH_NONE;
 		}
 	}
 

[Cluster-devel] cluster/fence/agents/xvm fence_xvm.c

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-03-06 15:32:50

Modified files:
	fence/agents/xvm: fence_xvm.c 

Log message:
	Resolves: 231151
	Enable auto-fallback to no-authentication for fence_xvm if fence_xvm.key does not exist.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvm.c.diff?cvsroot=cluster&r1=1.4&r2=1.5

--- cluster/fence/agents/xvm/fence_xvm.c	2006/11/13 16:13:50	1.4
+++ cluster/fence/agents/xvm/fence_xvm.c	2007/03/06 15:32:49	1.5
@@ -223,8 +223,10 @@
 	if (args->auth != AUTH_NONE || args->hash != HASH_NONE) {
 		key_len = read_key_file(args->key_file, key, sizeof(key));
 		if (key_len < 0) {
-			printf("Could not read key file\n");
-			return 1;
+			printf("Could not read %s; trying without "
+			       "authentication\n", args->key_file);
+			args->auth = AUTH_NONE;
+			args->hash = HASH_NONE;
 		}
 	}