diff options
| author |   reyk <reyk@openbsd.org> | 2016-07-19 17:31:22 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2016-07-19 17:31:22 +0000 |
| commit | 7e7c80c7c5281b0ef0ef5aebf7ea4ef1031f4586 (patch) | |
| tree | 3f058dfd5acc5a23b14d0b3ae29425cf5969f1d2 | |
| parent | Comment out device/switch(4) for now (diff) | |
| download | wireguard-openbsd-7e7c80c7c5281b0ef0ef5aebf7ea4ef1031f4586.tar.xz wireguard-openbsd-7e7c80c7c5281b0ef0ef5aebf7ea4ef1031f4586.zip | |
Don't use .p_shutdown in the proc struct
| -rw-r--r-- | usr.sbin/switchd/ofcconn.c | 3 | ||||
| -rw-r--r-- | usr.sbin/switchd/switchd.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/switchd/ofcconn.c b/usr.sbin/switchd/ofcconn.c index 8a90fc0366e..3881b333f29 100644 --- a/usr.sbin/switchd/ofcconn.c +++ b/usr.sbin/switchd/ofcconn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofcconn.c,v 1.1 2016/07/19 16:54:26 reyk Exp $ */ +/* $OpenBSD: ofcconn.c,v 1.2 2016/07/19 17:31:22 reyk Exp $ */ /* * Copyright (c) 2016 YASUOKA Masahiko <yasuoka@openbsd.org> @@ -78,6 +78,7 @@ int ofcconn_say_hello(struct ofcconn *); pid_t ofcconn_proc_init(struct privsep *ps, struct privsep_proc *p) { + p->p_shutdown = ofcconn_proc_shutdown; return (proc_run(ps, p, procs, nitems(procs), NULL, NULL)); } diff --git a/usr.sbin/switchd/switchd.c b/usr.sbin/switchd/switchd.c index 3bc84151d27..e8db42be69c 100644 --- a/usr.sbin/switchd/switchd.c +++ b/usr.sbin/switchd/switchd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: switchd.c,v 1.1 2016/07/19 16:54:26 reyk Exp $ */ +/* $OpenBSD: switchd.c,v 1.2 2016/07/19 17:31:22 reyk Exp $ */ /* * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org> @@ -54,8 +54,7 @@ __dead void usage(void); static struct privsep_proc procs[] = { { "ofp", PROC_OFP, NULL, ofp }, { "control", PROC_CONTROL, parent_dispatch_control, control }, - { "ofcconn", PROC_OFCCONN, NULL, ofcconn_proc_init, - .p_shutdown = ofcconn_proc_shutdown } + { "ofcconn", PROC_OFCCONN, NULL, ofcconn_proc_init } }; __dead void |