Merge

bk: 3ef7ff26T0GISRsR4lAb_MrU4qqIlA

diff --cc ntpd/ntp_config.c
index c48b67401076a5940f7f693604f67ee9fb2316ee,aa5a26a9dcd8084fa3f0fb4160af9bfd8f1f219b..049ff60ea26342d997b1f91cde4322b779fb2ed1
--- 1/ntpd/ntp_config.c
--- 2/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@@ -2085,7 -2006,10 +2085,10 @@@ getnetnum
  #ifdef DEBUG
                if (debug > 3)
                        printf(
-                               "getaddrinfo: \"%s\" invalid host address, line ignored\n",
 -                              "getnetnum: \"%s\" invalid host number%s.",
++                              "getaddrinfo: \"%s\" invalid host address%s.\n",
+                               (complain)
 -                              ? ", line ignored\n"
++                              ? ", line ignored"
+                               : "",
                                num);
  #endif
                return 0;