diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-09-27 21:39:27 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-09-27 21:39:27 +0000 |
| commit | 627e062a425e29e2657582080ef3542f6293eae3 (patch) | |
| tree | c94f2eb3fd2222d4eb6ee7f18b5619e9409717f1 | |
| parent | switch to using the new package signature scheme (signify2) by default (diff) | |
| download | wireguard-openbsd-627e062a425e29e2657582080ef3542f6293eae3.tar.xz wireguard-openbsd-627e062a425e29e2657582080ef3542f6293eae3.zip | |
The fork+exec privsep commit broke the "block request method" http
config option. Due to reordering of the code, the variable
http_methods was initialized to late. Insert a relay_http() before
load_config().
Found by make run-regress-args-http-filter-method.pl; OK reyk@
| -rw-r--r-- | usr.sbin/relayd/relayd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c index 0bde01402f0..501f247f087 100644 --- a/usr.sbin/relayd/relayd.c +++ b/usr.sbin/relayd/relayd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.c,v 1.160 2016/09/03 14:09:04 reyk Exp $ */ +/* $OpenBSD: relayd.c,v 1.161 2016/09/27 21:39:27 bluhm Exp $ */ /* * Copyright (c) 2007 - 2016 Reyk Floeter <reyk@openbsd.org> @@ -245,6 +245,7 @@ main(int argc, char *argv[]) proc_connect(ps); + relay_http(NULL); if (load_config(env->sc_conffile, env) == -1) { proc_kill(env->sc_ps); exit(1); |