[Cluster-devel] cluster/fence/agents/xvm fence_xvm.c simple_auth.c
lhh at sourceware.org
lhh at sourceware.org
Tue Mar 6 23:07:52 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL50
Changes by: lhh at sourceware.org 2007-03-06 23:07:51
Modified files:
fence/agents/xvm: fence_xvm.c simple_auth.c
Log message:
Fix 213241
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvm.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.3.4.1&r2=1.3.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/simple_auth.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.1.4.2&r2=1.1.4.3
--- cluster/fence/agents/xvm/fence_xvm.c 2006/11/13 16:14:18 1.3.4.1
+++ cluster/fence/agents/xvm/fence_xvm.c 2007/03/06 23:07:51 1.3.4.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/fence/agents/xvm/simple_auth.c 2006/11/13 21:19:06 1.1.4.2
+++ cluster/fence/agents/xvm/simple_auth.c 2007/03/06 23:07:51 1.1.4.3
@@ -80,7 +80,7 @@
HASH_Begin(h);
HASH_Update(h, key, key_len);
- HASH_Update(h, (void *)req, sizeof(req));
+ HASH_Update(h, (void *)req, sizeof(*req));
HASH_End(h, hash, &rlen, sizeof(hash));
HASH_Destroy(h);
@@ -123,7 +123,7 @@
HASH_Begin(h);
HASH_Update(h, key, key_len);
- HASH_Update(h, (void *)req, sizeof(req));
+ HASH_Update(h, (void *)req, sizeof(*req));
HASH_End(h, hash, &rlen, sizeof(hash));
HASH_Destroy(h);
@@ -374,10 +374,11 @@
int nread, remain = max_len;
char *p;
- dprintf(3, "Reading in key file %s into %p (%d len)",
+ dprintf(3, "Reading in key file %s into %p (%d max size)\n",
file, key, (int)max_len);
fd = open(file, O_RDONLY);
if (fd < 0) {
+ dprintf(2, "Error opening key file: %s\n", strerror(errno));
return -1;
}
@@ -403,8 +404,8 @@
remain -= nread;
}
- dprintf(3, "Actual key length = %d bytes", (int)max_len-remain);
close(fd);
+ dprintf(3, "Actual key length = %d bytes", (int)max_len-remain);
- return 0;
+ return (int)(max_len - remain);
}
More information about the Cluster-devel
mailing list