summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormestre <mestre@openbsd.org>2021-01-11 10:24:08 +0000
committermestre <mestre@openbsd.org>2021-01-11 10:24:08 +0000
commit528cf8a4de07ea146413c614f69b3a08211f83c5 (patch)
tree931bcbcbfcbffbe48c8f450994e66a0b45630adc
parentdocument how to specify multiple alternative names; (diff)
downloadwireguard-openbsd-528cf8a4de07ea146413c614f69b3a08211f83c5.tar.xz
wireguard-openbsd-528cf8a4de07ea146413c614f69b3a08211f83c5.zip
Stop deleting the control socket on daemon shutdown, like we did on other
daemons. This avoids giving an additional permission (in this case unveil(2) "c") to the daemon just to be able to delete the socket and we already discussed in the past that leaving that file behind doesn't cause any problems. Discussed with deraadt@ rob@ florian@ OK rob@ benno@ deraadt@
-rw-r--r--usr.sbin/relayd/relayd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 9390b2e4606..aa21afbe515 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.c,v 1.184 2020/09/14 11:30:25 martijn Exp $ */
+/* $OpenBSD: relayd.c,v 1.185 2021/01/11 10:24:08 mestre Exp $ */
/*
* Copyright (c) 2007 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -380,7 +380,6 @@ parent_shutdown(struct relayd *env)
proc_kill(env->sc_ps);
control_cleanup(&env->sc_ps->ps_csock);
- (void)unlink(env->sc_ps->ps_csock.cs_name);
carp_demote_shutdown();
free(env->sc_ps);