From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 29 Dec 2013 07:06:37 +0000 (+0000)
Subject: [Bug 2522] Revert Bug 2513 fix - it breaks backward compatibility
X-Git-Tag: NTP_4_2_7P407~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e5e338644ec3aa15464ee90315e69d2293d4180;p=thirdparty%2Fntp.git

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

bk: 52bfc9fd-IS2A_XVEj17EPlokPrR9A
---

diff --git a/ChangeLog b/ChangeLog
index c9b7804b9..ceec96b6b 100644
--- 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 19e8db750..6a84726f2 100644
--- 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);