From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 1 Sep 2012 03:37:42 +0000 (-0400)
Subject: Add a missing "%s" syslog format string
X-Git-Tag: NTP_4_2_7P298~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80bc73bdabdf519c5e34e9b4399e978f5179e70c;p=thirdparty%2Fntp.git

Add a missing "%s" syslog format string

bk: 50418306BYzqELSUD7HW0rLjOwfm0A
---

diff --git a/ChangeLog b/ChangeLog
index b8807a9aa..999647549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Handle additional man page sections in the bootstrap script.
+* Add a missing "%s" syslog format string.
 (4.2.7p297) 2012/09/01 Released by Harlan Stenn <stenn@ntp.org>
 * Fix mdoc2man.
 * Distribute ntp.conf.def and ntp.keys.def.
diff --git a/bootstrap b/bootstrap
index c65ffa106..c88ada455 100755
--- a/bootstrap
+++ b/bootstrap
@@ -90,7 +90,7 @@ do
     for i in `ls -1 $f*`
     do
 	case "$i" in
-	 *.c|*.h|*.1*man|*.1*mdoc|*.man.in|*.mdoc.in|*.texi|*.menu)
+	 *.c|*.h|*.[1-9]*man|*.[1-9]*mdoc|*.man.in|*.mdoc.in|*.texi|*.menu)
 	    l="$l $i"
 	    ;;
 	 *.html)
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index fcd1dd0c5..3836bdacf 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -2448,7 +2448,7 @@ config_access(
 		if ((RES_MSSNTP & flags) && !warned_signd) {
 			warned_signd = 1;
 			fprintf(stderr, "%s\n", signd_warning);
-			msyslog(LOG_WARNING, signd_warning);
+			msyslog(LOG_WARNING, "%s", signd_warning);
 		}
 
 		ZERO_SOCK(&addr);