From b448df251eecd8c1730273257ed1a3d550e83c0c Mon Sep 17 00:00:00 2001 From: mestre <> Date: Thu, 2 Aug 2018 13:05:34 +0000 Subject: [PATCH] ntpd(8) has logic in place to delete its control socket on shutdown, but it currently doesn't call the function control_cleanup to do so. The solution is to simply call that function just before the program quits. "sure" henning@ --- src/usr.sbin/ntpd/ntpd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c index 0ec3ede0..aba13223 100644 --- a/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.c,v 1.113 2017/01/09 14:49:22 reyk Exp $ */ +/* $OpenBSD: ntpd.c,v 1.114 2018/08/02 13:05:34 mestre Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -244,7 +244,7 @@ main(int argc, char *argv[]) * Constraint processes are forked with certificates in memory, * then privdrop into chroot before speaking to the outside world. */ - if (pledge("stdio rpath inet settime proc exec id", NULL) == -1) + if (pledge("stdio rpath cpath inet settime proc exec id", NULL) == -1) err(1, "pledge"); while (quit == 0) { @@ -327,6 +327,7 @@ main(int argc, char *argv[]) msgbuf_clear(&ibuf->w); free(ibuf); + control_cleanup(CTLSOCKET); log_info("Terminating"); return (0); }