diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2019-02-08 08:21:06 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2019-02-08 08:21:06 +0000 |
| commit | 885c237bd2d3bafcc5abaababe9e0eb3745a597e (patch) | |
| tree | f139e509bc66f1b991ca9b93886bd14983f41afc | |
| parent | a47ff333b25591136dec4462e7fb3052dc545213 (diff) | |
Oops, unbreak captive portal detection.
The captive portal process needs to receive sockets from the main
process to speak http to.
| -rw-r--r-- | sbin/unwind/captiveportal.c | 6 | ||||
| -rw-r--r-- | sbin/unwind/unwind.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sbin/unwind/captiveportal.c b/sbin/unwind/captiveportal.c index ac856d54a9c..902c9c957ec 100644 --- a/sbin/unwind/captiveportal.c +++ b/sbin/unwind/captiveportal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: captiveportal.c,v 1.2 2019/02/07 17:20:35 florian Exp $ */ +/* $OpenBSD: captiveportal.c,v 1.3 2019/02/08 08:21:05 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -302,10 +302,6 @@ captiveportal_dispatch_main(int fd, short event, void *bula) iev_frontend->events, iev_frontend->handler, iev_frontend); event_add(&iev_frontend->ev, NULL); break; - case IMSG_STARTUP: - if (pledge("stdio", NULL) == -1) - fatal("pledge"); - break; case IMSG_RECONF_CONF: if (imsg.hdr.len != IMSG_HEADER_SIZE + sizeof(struct unwind_conf)) diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c index 2f4ce08119c..2a99363fda8 100644 --- a/sbin/unwind/unwind.c +++ b/sbin/unwind/unwind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unwind.c,v 1.11 2019/02/07 17:20:35 florian Exp $ */ +/* $OpenBSD: unwind.c,v 1.12 2019/02/08 08:21:05 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -321,7 +321,6 @@ main(int argc, char *argv[]) main_imsg_compose_frontend(IMSG_STARTUP, 0, NULL, 0); main_imsg_compose_resolver(IMSG_STARTUP, 0, NULL, 0); - main_imsg_compose_captiveportal(IMSG_STARTUP, 0, NULL, 0); event_dispatch(); |