summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2015-02-23 09:52:28 +0000
committerreyk <reyk@openbsd.org>2015-02-23 09:52:28 +0000
commit2a1e39973663dc9ae043dd16f07015e1eeadb0f5 (patch)
treee98253aec76589022d980842cb9fdd1c790f3e7a
parentMake iwm(4) re-read the firmware image from disk on if down/up like other (diff)
downloadwireguard-openbsd-2a1e39973663dc9ae043dd16f07015e1eeadb0f5.tar.xz
wireguard-openbsd-2a1e39973663dc9ae043dd16f07015e1eeadb0f5.zip
Add return_uri to serverconfig_reset() to avoid using garbage from the
imsg buffer. Debugging & OK halex@
-rw-r--r--usr.sbin/httpd/server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c
index 9177bb20cd2..813f945e1bf 100644
--- a/usr.sbin/httpd/server.c
+++ b/usr.sbin/httpd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.59 2015/02/12 04:40:23 jsing Exp $ */
+/* $OpenBSD: server.c,v 1.60 2015/02/23 09:52:28 reyk Exp $ */
/*
* Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -323,6 +323,7 @@ serverconfig_reset(struct server_config *srv_conf)
{
srv_conf->tls_cert_file = srv_conf->tls_key_file = NULL;
srv_conf->tls_cert = srv_conf->tls_key = NULL;
+ srv_conf->return_uri = NULL;
srv_conf->auth = NULL;
}