diff options
| -rw-r--r-- | usr.sbin/ldpd/control.c | 5 | ||||
| -rw-r--r-- | usr.sbin/ldpd/control.h | 4 | ||||
| -rw-r--r-- | usr.sbin/ldpd/ldpe.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/ldpd/control.c b/usr.sbin/ldpd/control.c index fe0eebdbea6..5c598cd1917 100644 --- a/usr.sbin/ldpd/control.c +++ b/usr.sbin/ldpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.29 2017/03/03 23:30:57 renato Exp $ */ +/* $OpenBSD: control.c,v 1.30 2020/06/22 15:09:34 mestre Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -98,11 +98,10 @@ control_listen(void) } void -control_cleanup(char *path) +control_cleanup(void) { accept_del(control_fd); close(control_fd); - unlink(path); } /* ARGSUSED */ diff --git a/usr.sbin/ldpd/control.h b/usr.sbin/ldpd/control.h index f4f5525707d..72a9aa837a6 100644 --- a/usr.sbin/ldpd/control.h +++ b/usr.sbin/ldpd/control.h @@ -1,4 +1,4 @@ -/* $OpenBSD: control.h,v 1.9 2017/03/03 23:30:57 renato Exp $ */ +/* $OpenBSD: control.h,v 1.10 2020/06/22 15:09:34 mestre Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -32,7 +32,7 @@ extern struct ctl_conns ctl_conns; int control_init(char *); int control_listen(void); -void control_cleanup(char *); +void control_cleanup(void); int control_imsg_relay(struct imsg *); #endif /* _CONTROL_H_ */ diff --git a/usr.sbin/ldpd/ldpe.c b/usr.sbin/ldpd/ldpe.c index 6200d552882..404743ee8d5 100644 --- a/usr.sbin/ldpd/ldpe.c +++ b/usr.sbin/ldpd/ldpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldpe.c,v 1.76 2019/08/10 01:30:53 mestre Exp $ */ +/* $OpenBSD: ldpe.c,v 1.77 2020/06/22 15:09:34 mestre Exp $ */ /* * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org> @@ -171,7 +171,7 @@ ldpe_shutdown(void) msgbuf_clear(&iev_main->ibuf.w); close(iev_main->ibuf.fd); - control_cleanup(global.csock); + control_cleanup(); config_clear(leconf); if (sysdep.no_pfkey == 0) { |