diff options
| author |   remi <remi@openbsd.org> | 2020-09-16 20:50:10 +0000 |
|---|---|---|
| committer | remi <remi@openbsd.org> | 2020-09-16 20:50:10 +0000 |
| commit | faef135eb5208cabc87ebab38a843f99e0929c39 (patch) | |
| tree | 3ba2631b999e906564af4445bac6665ceb92b206 /usr.sbin/ospfd/ospfd.c | |
| parent | Apparently some time ago I moved the timeout argument to the final position (diff) | |
| download | wireguard-openbsd-faef135eb5208cabc87ebab38a843f99e0929c39.tar.xz wireguard-openbsd-faef135eb5208cabc87ebab38a843f99e0929c39.zip | |
Stop removing the control socket on exit and tighten the unveil even
further. This is in line with what other networking daemons do.
ok mestre@
Diffstat (limited to 'usr.sbin/ospfd/ospfd.c')
| -rw-r--r-- | usr.sbin/ospfd/ospfd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c index 5d00cc81912..0f8f0e8485e 100644 --- a/usr.sbin/ospfd/ospfd.c +++ b/usr.sbin/ospfd/ospfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.c,v 1.113 2020/06/26 19:04:38 bket Exp $ */ +/* $OpenBSD: ospfd.c,v 1.114 2020/09/16 20:50:10 remi Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -282,8 +282,6 @@ main(int argc, char *argv[]) if (unveil("/", "r") == -1) fatal("unveil"); - if (unveil(ospfd_conf->csock, "c") == -1) - fatal("unveil"); if (unveil(NULL, NULL) == -1) fatal("unveil"); @@ -318,7 +316,7 @@ ospfd_shutdown(void) msgbuf_clear(&iev_rde->ibuf.w); close(iev_rde->ibuf.fd); - control_cleanup(ospfd_conf->csock); + control_cleanup(); while ((r = SIMPLEQ_FIRST(&ospfd_conf->redist_list)) != NULL) { SIMPLEQ_REMOVE_HEAD(&ospfd_conf->redist_list, entry); free(r); |