diff options
| author |   reyk <reyk@openbsd.org> | 2016-01-27 21:48:34 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2016-01-27 21:48:34 +0000 |
| commit | 0a1ac5ece8021b85b58c55b01367be73beea211a (patch) | |
| tree | 29f852b1289b011fc2b06fd487984c23581c5e3f /usr.sbin/ntpd/ntpd.c | |
| parent | update ntpd log initialization to work like relayd, fix debug log levels (diff) | |
| download | wireguard-openbsd-0a1ac5ece8021b85b58c55b01367be73beea211a.tar.xz wireguard-openbsd-0a1ac5ece8021b85b58c55b01367be73beea211a.zip | |
Don't attempt to kill() the constraint in the wrong process. The
process management of the contraint processes has been moved from ntp
to the parent, for better privsep and pledge, but the ntp process
still attempted to kill the constraints on timeout directly. Fix this
regression by introducing a new imsg from ntp to the parent and the
related logic to kill a constraint at the right place.
Reported & tested by bcook@
Ok bcook@
Diffstat (limited to 'usr.sbin/ntpd/ntpd.c')
| -rw-r--r-- | usr.sbin/ntpd/ntpd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c index 9a54c524d57..fe79f6d9bc6 100644 --- a/usr.sbin/ntpd/ntpd.c +++ b/usr.sbin/ntpd/ntpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.c,v 1.104 2016/01/27 21:36:25 bcook Exp $ */ +/* $OpenBSD: ntpd.c,v 1.105 2016/01/27 21:48:34 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -413,6 +413,9 @@ dispatch_imsg(struct ntpd_conf *lconf, const char *pw_dir, imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE, pw_dir, pw_uid, pw_gid); break; + case IMSG_CONSTRAINT_KILL: + priv_constraint_kill(imsg.hdr.peerid); + break; default: break; } |