From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 29 Oct 2007 17:54:26 -0000
Subject: [Cluster-devel] cluster/cman/qdisk clulog.c disk.c
Message-ID: <20071029175426.7339.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
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-10-29 17:54:25

Modified files:
	cman/qdisk     : clulog.c disk.c 

Log message:
	Fix format string bugs.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/clulog.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.4.1&r2=1.2.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/disk.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4&r2=1.4.4.1

--- cluster/cman/qdisk/clulog.c	2007/01/22 22:50:11	1.2.4.1
+++ cluster/cman/qdisk/clulog.c	2007/10/29 17:54:25	1.2.4.2
@@ -273,7 +273,7 @@
 		fprintf(stdout, "%s", printmsg);
 	}
 
-	syslog(severity, logmsg);
+	syslog(severity, "%s", logmsg);
 
 	pthread_mutex_unlock(&log_mutex);
 
--- cluster/cman/qdisk/disk.c	2006/06/23 16:05:33	1.4
+++ cluster/cman/qdisk/disk.c	2007/10/29 17:54:25	1.4.4.1
@@ -679,7 +679,7 @@
 	}
 
 	/* Copy in the cluster/label name */
-	snprintf(qh.qh_cluster, sizeof(qh.qh_cluster)-1, label);
+	snprintf(qh.qh_cluster, sizeof(qh.qh_cluster)-1, "%s", label);
 
 	if ((qh.qh_timestamp = (uint64_t)time(NULL)) <= 0) {
 		perror("time");