Bug 3509 tweaks

bk: 5b582902kZHVH5nQiBrQJ1D1an9UCQ

diff --git a/NEWS b/NEWS
index 662315cca4364773f58fce953b15cdcfc38c69b3..3a18f65135ce4adf6e1537860ac0faa96901898e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,13 +9,18 @@ Severity: MEDIUM
 
 This release fixes a "hole" in the noepeer capability introduced to ntpd
 in ntp-4.2.8p11, and a buffer overflow in the openhost() function used by
-ntpq and ntpdc.  It also provides 25 other bugfixes, and 3 other improvements:
+ntpq and ntpdc.  It also provides 26 other bugfixes, and 3 other improvements:
 
 * [Sec 3505]
 
 * [Sec 3012] 
 
 * Bug Fixes:
+ [Bug 3509] Add support for running as non-root on FreeBSD, Darwin,
+            other TrustedBSD platforms
+ - applied patch by Ian Lepore <perlinger@ntp.org>
+ [Bug 3506] Service Control Manager interacts poorly with NTPD <perlinger@ntp.org>
+ - changed interaction with SCM to signal pending startup
  [Bug 3486] Buffer overflow in ntpq/ntpq.c:tstflags() <perlinger@ntp.org>
  - applied patch by Gerry Garvey
  [Bug 3485] Undefined sockaddr used in error messages in ntp_config.c <perlinger@ntp.org>

diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index adf97cea4026eb920947835df460424ac316af3c..7aacde7633f22de6fee1fd2cc540b2f0a9eafeb9 100644 (file)
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -699,7 +699,7 @@ AC_ARG_ENABLE(
     [trustedbsd_mac],
     [AS_HELP_STRING(
        [--enable-trustedbsd-mac],
-       [- Use TrustedBSD MAC policy for non-root clock control]
+       [s Use TrustedBSD MAC policy for non-root clock control]
     )],
     [ntp_use_trustedbsd_mac=$enableval]
 )