Add a missing "%s" syslog format string

bk: 50418306BYzqELSUD7HW0rLjOwfm0A

diff --git a/ChangeLog b/ChangeLog
index b8807a9aaec1d64a04fc4fd33c33882e9dd5521f..99964754970171a7300144242cad2ef157361f7a 100644 (file)
--- 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 c65ffa106f8077682dc2343798ae3764f13932b6..c88ada4554569977504e454739bcebdbac70edff 100755 (executable)
--- 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 fcd1dd0c5b6efeee677d7e38a7cc7d65afee62db..3836bdacf6f6444955a84fc48bd9cc81876600aa 100644 (file)
--- 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);