From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 6 Mar 2007 23:08:31 -0000
Subject: [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
Message-ID: <20070306230831.26946.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-03-06 23:08:31

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

Log message:
	Fix 213241

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

--- cluster/fence/agents/xvm/simple_auth.c	2007/03/06 15:43:53	1.5
+++ cluster/fence/agents/xvm/simple_auth.c	2007/03/06 23:08:31	1.6
@@ -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);
 
@@ -404,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);
 }