diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2015-07-21 05:04:13 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2015-07-21 05:04:13 +0000 |
| commit | 5b9af45894df37d6bbbd16f39fe688f8d68ba879 (patch) | |
| tree | 97aaf2ad642f367e2cb566787cc921884b756875 | |
| parent | c58f08594fe2c7a80711ce3d2a0c3fa199a54de7 (diff) | |
Call control_cleanup() from the ldpe process, where it belongs.
ok claudio@
| -rw-r--r-- | usr.sbin/ldpd/ldpd.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldpe.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c index 0f6dccce512..3be46505dc0 100644 --- a/usr.sbin/ldpd/ldpd.c +++ b/usr.sbin/ldpd/ldpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpd.c,v 1.25 2015/07/21 04:52:29 renato Exp $ */ +/* $OpenBSD: ldpd.c,v 1.26 2015/07/21 05:04:12 renato Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -274,7 +274,6 @@ ldpd_shutdown(void) if (lde_pid) kill(lde_pid, SIGTERM); - control_cleanup(); kr_shutdown(); do { diff --git a/usr.sbin/ldpd/ldpe.c b/usr.sbin/ldpd/ldpe.c index d0f204c35f6..8df97e506cd 100644 --- a/usr.sbin/ldpd/ldpe.c +++ b/usr.sbin/ldpd/ldpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpe.c,v 1.38 2015/07/21 05:02:57 renato Exp $ */ +/* $OpenBSD: ldpe.c,v 1.39 2015/07/21 05:04:12 renato Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -283,6 +283,8 @@ ldpe_shutdown(void) { struct if_addr *if_addr; + control_cleanup(); + event_del(&disc_ev); event_del(&edisc_ev); event_del(&pfkey_ev); |