diff options
| -rw-r--r-- | usr.sbin/eigrpd/eigrpd.c | 8 | ||||
| -rw-r--r-- | usr.sbin/eigrpd/eigrpe.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/eigrpd/eigrpd.c b/usr.sbin/eigrpd/eigrpd.c index 6e5d5ddf6da..8fb673bc242 100644 --- a/usr.sbin/eigrpd/eigrpd.c +++ b/usr.sbin/eigrpd/eigrpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eigrpd.c,v 1.21 2016/09/02 17:59:58 benno Exp $ */ +/* $OpenBSD: eigrpd.c,v 1.22 2018/08/02 06:28:35 mestre Exp $ */ /* * Copyright (c) 2015 Renato Westphal <renato@openbsd.org> @@ -36,6 +36,7 @@ #include "eigrpe.h" #include "rde.h" #include "log.h" +#include "control.h" static void main_sig_handler(int, short, void *); static __dead void usage(void); @@ -167,6 +168,8 @@ main(int argc, char *argv[]) else if (eflag) eigrpe(debug, global.cmd_opts & EIGRPD_OPT_VERBOSE, sockname); + global.csock = sockname; + mib[0] = CTL_NET; mib[1] = PF_INET; mib[2] = IPPROTO_IP; @@ -268,7 +271,7 @@ main(int argc, char *argv[]) eigrpd_conf->rdomain) == -1) fatalx("kr_init failed"); - if (pledge("inet rpath stdio sendfd", NULL) == -1) + if (pledge("inet rpath cpath stdio sendfd", NULL) == -1) fatal("pledge"); event_dispatch(); @@ -290,6 +293,7 @@ eigrpd_shutdown(void) msgbuf_clear(&iev_rde->ibuf.w); close(iev_rde->ibuf.fd); + control_cleanup(global.csock); kr_shutdown(); config_clear(eigrpd_conf); diff --git a/usr.sbin/eigrpd/eigrpe.c b/usr.sbin/eigrpd/eigrpe.c index 5daba291106..afe92e68206 100644 --- a/usr.sbin/eigrpd/eigrpe.c +++ b/usr.sbin/eigrpd/eigrpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eigrpe.c,v 1.34 2016/09/02 17:59:58 benno Exp $ */ +/* $OpenBSD: eigrpe.c,v 1.35 2018/08/02 06:28:35 mestre Exp $ */ /* * Copyright (c) 2015 Renato Westphal <renato@openbsd.org> @@ -133,7 +133,7 @@ eigrpe(int debug, int verbose, char *sockname) setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid)) fatal("can't drop privileges"); - if (pledge("stdio cpath inet mcast recvfd", NULL) == -1) + if (pledge("stdio inet mcast recvfd", NULL) == -1) fatal("pledge"); event_init(); @@ -187,7 +187,6 @@ eigrpe_shutdown(void) msgbuf_clear(&iev_main->ibuf.w); close(iev_main->ibuf.fd); - control_cleanup(global.csock); config_clear(econf); event_del(&ev4); |