[Bug 2513] Remove any PIDFILE in finish()

bk: 52b7ee4d1W6Y-NABGyHfqcKoh8_8ow

diff --git a/ChangeLog b/ChangeLog
index 9c3acc75f50a80c24dd3bf217c0f495d812c053d..3ad3dd669626e80ee180f162c8c71636faa57075 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2513] Remove any PIDFILE in finish().
 * [Bug 2516] Enable clock_gettime() support for AIX 5+.
 * [Bug 2517] Fix peer status errors in decode.html.
 (4.2.7p402) 2013/12/23 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 49a9cbf3fd2ed565fa815f69df060f7e0ca933f1..19e8db750ad1dbc3b19f6270393b8e3cbc45c404 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -1143,6 +1143,10 @@ 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 ));
 # ifdef HAVE_DNSREGISTRATION
        if (mdns != NULL)
                DNSServiceRefDeallocate(mdns);