diff options
author | asmodai <asmodai@FreeBSD.org> | 2001-08-23 21:46:59 +0000 |
---|---|---|
committer | asmodai <asmodai@FreeBSD.org> | 2001-08-23 21:46:59 +0000 |
commit | 3cef0337e4d185877915756086e0dfa75f9dbefc (patch) | |
tree | 78e4c1d62ee601e651579e86f1183d52bbba8608 /contrib/bind/bin/named | |
parent | de539f43e349c5bad5bc1d55f39ee0bab0d8c567 (diff) | |
parent | 1385a0dca8f9199ece158336f4c6a9f1e2e03c3e (diff) | |
download | FreeBSD-src-3cef0337e4d185877915756086e0dfa75f9dbefc.zip FreeBSD-src-3cef0337e4d185877915756086e0dfa75f9dbefc.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r82230,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/bind/bin/named')
-rw-r--r-- | contrib/bind/bin/named/ns_ixfr.c | 6 | ||||
-rw-r--r-- | contrib/bind/bin/named/ns_maint.c | 4 | ||||
-rw-r--r-- | contrib/bind/bin/named/ns_req.c | 5 | ||||
-rw-r--r-- | contrib/bind/bin/named/ns_stats.c | 10 |
4 files changed, 12 insertions, 13 deletions
diff --git a/contrib/bind/bin/named/ns_ixfr.c b/contrib/bind/bin/named/ns_ixfr.c index b54a275..c013717 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 d8e41dc..8220e51 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 671b31e..252ddbd 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 b823462..0af3e2f 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 |