[Bug 2522] Revert Bug 2513 fix - it breaks backward compatibility

bk: 52bfc9fd-IS2A_XVEj17EPlokPrR9A

diff --git a/ChangeLog b/ChangeLog
index c9b7804b9fb21f16888169c59695cb3cb721f37b..ceec96b6b8217dbdb8fae66ab2d04cd9e1949bc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2522] Revert Bug 2513 fix - it breaks backward compatibility.
 (4.2.7p406) 2013/12/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2521] VPATH tweaks for perl -opts files.
 (4.2.7p405) 2013/12/27 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 19e8db750ad1dbc3b19f6270393b8e3cbc45c404..6a84726f26663c52a8b8dda145440cc5f7477827 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -1143,10 +1143,7 @@ finish(
                sig_desc = "";
        msyslog(LOG_NOTICE, "%s exiting on signal %d (%s)", progname,
                sig, sig_desc);
-       if (HAVE_OPT( PIDFILE ))
-               if (-1 == unlink(OPT_ARG( PIDFILE )))
-                       msyslog(LOG_NOTICE, "unlink(\"%s\") failed: %m",
-                               OPT_ARG( PIDFILE ));
+       /* See Bug 2513 and Bug 2522 re the unlink of PIDFILE */
 # ifdef HAVE_DNSREGISTRATION
        if (mdns != NULL)
                DNSServiceRefDeallocate(mdns);