summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorSebastian Benoit <benno@cvs.openbsd.org>2020-08-03 10:55:59 +0000
committerSebastian Benoit <benno@cvs.openbsd.org>2020-08-03 10:55:59 +0000
commit4e612119d3a1920a0cf1bee69c70b7a9a251901e (patch)
treea6b6cb318a1dc57d3a3ae6a9f55655d1d5e3a6ad /usr.sbin/httpd
parente1b6dd8fbac762313b797e02e01a5aee4d679f75 (diff)
remove dead assignments
from Ross L Richardson <openbsd AT rlr DOT id DOT au>, Thanks ok claudio@
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/config.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c
index 50595abbd1f..9502647d44a 100644
--- a/usr.sbin/httpd/config.c
+++ b/usr.sbin/httpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.57 2019/05/08 19:57:45 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.58 2020/08/03 10:55:58 benno Exp $ */
/*
* Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -135,9 +135,7 @@ config_getreset(struct httpd *env, struct imsg *imsg)
int
config_getcfg(struct httpd *env, struct imsg *imsg)
{
- struct privsep *ps = env->sc_ps;
struct ctl_flags cf;
- unsigned int what;
if (IMSG_DATA_SIZE(imsg) != sizeof(cf))
return (0); /* ignore */
@@ -148,8 +146,6 @@ config_getcfg(struct httpd *env, struct imsg *imsg)
env->sc_flags = cf.cf_flags;
memcpy(env->sc_tls_sid, cf.cf_tls_sid, sizeof(env->sc_tls_sid));
- what = ps->ps_what[privsep_process];
-
if (privsep_process != PROC_PARENT)
proc_compose(env->sc_ps, PROC_PARENT,
IMSG_CFG_DONE, NULL, 0);
@@ -683,7 +679,6 @@ config_getserver(struct httpd *env, struct imsg *imsg)
if ((srv->srv_conf.return_uri = get_data(p + s,
srv->srv_conf.return_uri_len)) == NULL)
goto fail;
- s += srv->srv_conf.return_uri_len;
}
return (0);