[Bug 2028] ntpd -n (nofork) redirects logging to stderr.

bk: 4e92794ewedJBmCVR8e1ZMdncfyDDg

diff --git a/ChangeLog b/ChangeLog
index 0fd4e06b372c444bc22be8b1884a579e043bfb33..d2ecde554fad595eef5e42e16eb0b0cc1f9f97a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * [Bug 2025] Switching between daemon and kernel loops can doubly-
   correct drift
+* [Bug 2028] ntpd -n (nofork) redirects logging to stderr.
 * Documentation updates from Dave Mills.
 (4.2.7p220) 2011/10/05 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1945] mbg_gps166.h use of _TM_DEFINED conflicts with MS VC.

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 42cbf247726c3d18bf76005c9316724281d14442..070bbf1d17b15ca0248fd07ec5258b556f0523ac 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -487,11 +487,8 @@ ntpdmain(
                change_logfile(logfilename, FALSE);
        } else {
                logfilename = NULL;
-               if (nofork) {
-                       msyslog_term = FALSE;
-                       syslogit = FALSE;
-                       change_logfile("stderr", FALSE);
-               }
+               if (nofork)
+                       msyslog_term = TRUE;
        }
        msyslog(LOG_NOTICE, "%s\n", Version);