From 2cf92774d22db082dfd96fc0fbc9b540ddc0d9e4 Mon Sep 17 00:00:00 2001
From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
Date: Thu, 23 Aug 2001 21:46:59 +0000
Subject: [PATCH] String format patch

---
 contrib/bind/bin/host/host.c      |  6 +++---
 contrib/bind/bin/named/ns_ixfr.c  |  6 +++---
 contrib/bind/bin/named/ns_maint.c |  4 ++--
 contrib/bind/bin/named/ns_req.c   |  5 ++---
 contrib/bind/bin/named/ns_stats.c | 10 +++++-----
 contrib/bind/lib/dst/dst_api.c    |  4 ++--
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/contrib/bind/bin/host/host.c b/contrib/bind/bin/host/host.c
index 9303ab1d0f3..6ec63dfba57 100644
--- a/contrib/bind/bin/host/host.c
+++ b/contrib/bind/bin/host/host.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char rcsid[] = "$Id: host.c,v 8.43.2.1 2001/04/26 02:56:07 marka Exp $";
+static const char rcsid[] = "$Id: host.c,v 8.43.2.2 2001/08/09 14:04:45 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -755,12 +755,12 @@ void print_hex_field (u_int8_t field[], int length, int width, char *pref)
 	do
 	{
 		stop=(start+width)<length?(start+width):length;
-		printf (pref);
+		printf ("%s", pref);
  		for (i = start; i < stop; i++)
 			printf ("%02x ", (u_char) field[i]);
 		printf ("\n");
 
-		printf (pref);
+		printf ("%s", pref);
 		for (i = start; i < stop; i++)
 			if (isprint(field[i]))
 				printf (" %c ", (u_char) field[i]);
diff --git a/contrib/bind/bin/named/ns_ixfr.c b/contrib/bind/bin/named/ns_ixfr.c
index b54a275dcca..c013717f3af 100644
--- a/contrib/bind/bin/named/ns_ixfr.c
+++ b/contrib/bind/bin/named/ns_ixfr.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ns_ixfr.c,v 8.26 2001/03/12 01:48:58 marka Exp $";
+static const char rcsid[] = "$Id: ns_ixfr.c,v 8.26.2.2 2001/08/10 03:00:08 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -489,8 +489,8 @@ ixfr_log_maint(struct zoneinfo *zp) {
 
 	(void) strcat(tmpname, ".XXXXXX");
 	if ((fd = mkstemp(tmpname)) == -1) {
-		ns_warning(ns_log_db, "can't make tmpfile (%s): %s", 
-				strerror(errno));
+		ns_warning(ns_log_db, "can't make tmpfile (%s): %s",
+			   tmpname, strerror(errno));
 		memput(tmpname, len);
 		(void) my_fclose(from_fp);
 	 	return (-1);
diff --git a/contrib/bind/bin/named/ns_maint.c b/contrib/bind/bin/named/ns_maint.c
index d8e41dc87e5..8220e51242c 100644
--- a/contrib/bind/bin/named/ns_maint.c
+++ b/contrib/bind/bin/named/ns_maint.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_maint.c	4.39 (Berkeley) 3/2/91";
-static const char rcsid[] = "$Id: ns_maint.c,v 8.122 2001/03/01 06:26:31 marka Exp $";
+static const char rcsid[] = "$Id: ns_maint.c,v 8.122.2.4 2001/08/10 03:00:11 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -897,7 +897,7 @@ startxfer(struct zoneinfo *zp) {
 			curr++;
 		}
 		*curr = '\0';
-		ns_debug(ns_log_xfer_in, 1, buffer);
+		ns_debug(ns_log_xfer_in, 1, "%s", buffer);
 	}
 #endif /* DEBUG */
 
diff --git a/contrib/bind/bin/named/ns_req.c b/contrib/bind/bin/named/ns_req.c
index 671b31eaf5b..252ddbd803c 100644
--- a/contrib/bind/bin/named/ns_req.c
+++ b/contrib/bind/bin/named/ns_req.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_req.c	4.47 (Berkeley) 7/1/91";
-static const char rcsid[] = "$Id: ns_req.c,v 8.138.2.1 2001/04/27 07:44:05 marka Exp $";
+static const char rcsid[] = "$Id: ns_req.c,v 8.138.2.4 2001/08/10 03:00:14 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -202,8 +202,7 @@ ns_req(u_char *msg, int msglen, int buflen, struct qstream *qsp,
 		n = dn_expand(msg, msg + msglen, tsigstart, buf, sizeof buf);
 		if (n < 0) {
 			ns_debug(ns_log_default, 1,
-				 "ns_req: bad TSIG key name",
-				 buf);
+				 "ns_req: bad TSIG key name");
 			error = ns_r_formerr;
 			hp->rcode = ns_r_formerr;
 			key = NULL;
diff --git a/contrib/bind/bin/named/ns_stats.c b/contrib/bind/bin/named/ns_stats.c
index b823462d4fb..0af3e2f3e17 100644
--- a/contrib/bind/bin/named/ns_stats.c
+++ b/contrib/bind/bin/named/ns_stats.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_stats.c	4.10 (Berkeley) 6/27/90";
-static const char rcsid[] = "$Id: ns_stats.c,v 8.32 2000/11/29 06:56:05 marka Exp $";
+static const char rcsid[] = "$Id: ns_stats.c,v 8.32.2.1 2001/08/09 14:04:49 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -407,13 +407,13 @@ ns_logstats(evContext ctx, void *uap, struct timespec due,
 			sprintf(buffer2, " %s=%lu", p_type(i), typestats[i]);
 			if (strlen(buffer) + strlen(buffer2) >
 			    sizeof(buffer) - 1) {
-				ns_info(ns_log_statistics, buffer);
+				ns_info(ns_log_statistics, "%s", buffer);
 				strcpy(buffer, header);
 			}
 			strcat(buffer, buffer2);
 		}
 	}
-	ns_info(ns_log_statistics, buffer);
+	ns_info(ns_log_statistics, "%s", buffer);
 
 	sprintf(header, "XSTATS %lu %lu", (u_long)timenow, (u_long)boottime);
 	strcpy(buffer, header);
@@ -421,12 +421,12 @@ ns_logstats(evContext ctx, void *uap, struct timespec due,
 		sprintf(buffer2, " %s=%lu",
 			statNames[i]?statNames[i]:"?", (u_long)globalStats[i]);
 		if (strlen(buffer) + strlen(buffer2) > sizeof(buffer) - 1) {
-			ns_info(ns_log_statistics, buffer);
+			ns_info(ns_log_statistics, "%s", buffer);
 			strcpy(buffer, header);
 		}
 		strcat(buffer, buffer2);
 	}
-	ns_info(ns_log_statistics, buffer);
+	ns_info(ns_log_statistics, "%s", buffer);
 }
 
 static void
diff --git a/contrib/bind/lib/dst/dst_api.c b/contrib/bind/lib/dst/dst_api.c
index c296fdddb3d..a79dcf1ee73 100644
--- a/contrib/bind/lib/dst/dst_api.c
+++ b/contrib/bind/lib/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/isc/bind8/src/lib/dst/dst_api.c,v 1.17 2001/04/05 22:00:02 bwelling Exp $";
+static const char rcsid[] = "$Header: /proj/cvs/isc/bind8/src/lib/dst/dst_api.c,v 1.17.2.2 2001/07/26 01:58:06 marka Exp $";
 #endif
 
 /*
@@ -433,7 +433,7 @@ dst_s_write_private_key(const DST_KEY *key)
 		int nn;
 		if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
 			EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
-				 file, out_len, nn, errno));
+				 file, len, nn, errno));
 			return (-5);
 		}
 		fclose(fp);