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

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-03-06 23:01:35

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

Log message:
	Fix 213246

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

--- cluster/fence/agents/xvm/simple_auth.c	2006/12/01 15:49:38	1.3.2.1
+++ cluster/fence/agents/xvm/simple_auth.c	2007/03/06 23:01:35	1.3.2.2
@@ -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);
 
@@ -403,8 +403,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);
 }