cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2006-11-13 22:16 cfeist
  0 siblings, 0 replies; 9+ messages in thread
From: cfeist @ 2006-11-13 22:16 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	cfeist at sourceware.org	2006-11-13 22:16:53

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

Log message:
	Fixes to prevent compile time warnings/errors in brew.

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

--- cluster/fence/agents/xvm/simple_auth.c	2006/11/13 16:13:50	1.2
+++ cluster/fence/agents/xvm/simple_auth.c	2006/11/13 22:16:53	1.3
@@ -375,7 +375,7 @@
 	char *p;
 
 	dprintf(3, "Reading in key file %s into %p (%d len)",
-		file, key, max_len);
+		file, key, (int)max_len);
 	fd = open(file, O_RDONLY);
 	if (fd < 0) {
 		return -1;
@@ -395,7 +395,7 @@
 
 		if (nread == 0) {
 			dprintf(3, "Stopped reading @ %d bytes",
-				max_len-remain);
+				(int)max_len-remain);
 			break;
 		}
 		
@@ -403,7 +403,7 @@
 		remain -= nread;
 	}
 
-	dprintf(3, "Actual key length = %d bytes", max_len-remain);
+	dprintf(3, "Actual key length = %d bytes", (int)max_len-remain);
 	close(fd);	
 	
 	return 0;



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2007-03-06 23:08 lhh
  0 siblings, 0 replies; 9+ messages in thread
From: lhh @ 2007-03-06 23:08 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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);
 }



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2007-03-06 23:06 lhh
  0 siblings, 0 replies; 9+ messages in thread
From: lhh @ 2007-03-06 23:06 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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

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&only_with_tag=RHEL5&r1=1.1.2.3&r2=1.1.2.4

--- cluster/fence/agents/xvm/simple_auth.c	2007/03/06 15:42:10	1.1.2.3
+++ cluster/fence/agents/xvm/simple_auth.c	2007/03/06 23:06:47	1.1.2.4
@@ -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);
 }



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2007-03-06 23:01 lhh
  0 siblings, 0 replies; 9+ messages in thread
From: lhh @ 2007-03-06 23:01 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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);
 }



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2007-03-06 15:43 lhh
  0 siblings, 0 replies; 9+ messages in thread
From: lhh @ 2007-03-06 15:43 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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

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

Log message:
	Add open failure message

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

--- cluster/fence/agents/xvm/simple_auth.c	2007/03/06 15:40:20	1.4
+++ cluster/fence/agents/xvm/simple_auth.c	2007/03/06 15:43:53	1.5
@@ -374,10 +374,11 @@
 	int nread, remain = max_len;
 	char *p;
 
-	dprintf(3, "Reading in key file %s into %p (%d len)\n",
+	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;
 	}
 



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2007-03-06 15:42 lhh
  0 siblings, 0 replies; 9+ messages in thread
From: lhh @ 2007-03-06 15:42 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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

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

Log message:
	Fix missing newline in debug message; add open failure message

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

--- cluster/fence/agents/xvm/simple_auth.c	2006/11/13 22:17:45	1.1.2.2
+++ cluster/fence/agents/xvm/simple_auth.c	2007/03/06 15:42:10	1.1.2.3
@@ -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;
 	}
 



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2007-03-06 15:40 lhh
  0 siblings, 0 replies; 9+ messages in thread
From: lhh @ 2007-03-06 15:40 UTC (permalink / raw)
  To: cluster-devel.redhat.com

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

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

Log message:
	Fix missing newline in debug message

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

--- cluster/fence/agents/xvm/simple_auth.c	2006/11/13 22:16:53	1.3
+++ cluster/fence/agents/xvm/simple_auth.c	2007/03/06 15:40:20	1.4
@@ -374,7 +374,7 @@
 	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 len)\n",
 		file, key, (int)max_len);
 	fd = open(file, O_RDONLY);
 	if (fd < 0) {



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2006-11-13 22:17 cfeist
  0 siblings, 0 replies; 9+ messages in thread
From: cfeist @ 2006-11-13 22:17 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	cfeist at sourceware.org	2006-11-13 22:17:46

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

Log message:
	Fixes to prevent compile time warnings/errors in brew.

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

--- cluster/fence/agents/xvm/simple_auth.c	2006/11/13 16:14:06	1.1.2.1
+++ cluster/fence/agents/xvm/simple_auth.c	2006/11/13 22:17:45	1.1.2.2
@@ -375,7 +375,7 @@
 	char *p;
 
 	dprintf(3, "Reading in key file %s into %p (%d len)",
-		file, key, max_len);
+		file, key, (int)max_len);
 	fd = open(file, O_RDONLY);
 	if (fd < 0) {
 		return -1;
@@ -395,7 +395,7 @@
 
 		if (nread == 0) {
 			dprintf(3, "Stopped reading @ %d bytes",
-				max_len-remain);
+				(int)max_len-remain);
 			break;
 		}
 		
@@ -403,7 +403,7 @@
 		remain -= nread;
 	}
 
-	dprintf(3, "Actual key length = %d bytes", max_len-remain);
+	dprintf(3, "Actual key length = %d bytes", (int)max_len-remain);
 	close(fd);	
 	
 	return 0;



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Cluster-devel] cluster/fence/agents/xvm simple_auth.c
@ 2006-11-13 21:19 cfeist
  0 siblings, 0 replies; 9+ messages in thread
From: cfeist @ 2006-11-13 21:19 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL50
Changes by:	cfeist at sourceware.org	2006-11-13 21:19:06

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

Log message:
	Fixes to prevent compile time warnings/errors in brew.

Patches:
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.1&r2=1.1.4.2

--- cluster/fence/agents/xvm/simple_auth.c	2006/11/13 16:14:18	1.1.4.1
+++ cluster/fence/agents/xvm/simple_auth.c	2006/11/13 21:19:06	1.1.4.2
@@ -375,7 +375,7 @@
 	char *p;
 
 	dprintf(3, "Reading in key file %s into %p (%d len)",
-		file, key, max_len);
+		file, key, (int)max_len);
 	fd = open(file, O_RDONLY);
 	if (fd < 0) {
 		return -1;
@@ -395,7 +395,7 @@
 
 		if (nread == 0) {
 			dprintf(3, "Stopped reading @ %d bytes",
-				max_len-remain);
+				(int)max_len-remain);
 			break;
 		}
 		
@@ -403,7 +403,7 @@
 		remain -= nread;
 	}
 
-	dprintf(3, "Actual key length = %d bytes", max_len-remain);
+	dprintf(3, "Actual key length = %d bytes", (int)max_len-remain);
 	close(fd);	
 	
 	return 0;



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2007-03-06 23:08 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-13 22:16 [Cluster-devel] cluster/fence/agents/xvm simple_auth.c cfeist
  -- strict thread matches above, loose matches on Subject: below --
2007-03-06 23:08 lhh
2007-03-06 23:06 lhh
2007-03-06 23:01 lhh
2007-03-06 15:43 lhh
2007-03-06 15:42 lhh
2007-03-06 15:40 lhh
2006-11-13 22:17 cfeist
2006-11-13 21:19 cfeist

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).