From: claudio <claudio@openbsd.org>
Date: Tue, 4 Apr 2017 20:16:09 +0000 (+0000)
Subject: Do not purge the CONFIG_SERVERS config in the parent. The ticket code uses
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=da6b656641152546bb3bbe228f5a02abcb60aa80;p=openbsd

Do not purge the CONFIG_SERVERS config in the parent. The ticket code uses
the servers config for its rekeying handling. Without this no rekeying happens
and httpd stops working. Learned the hard way by me and beck@
OK reyk@
---

diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c
index 879845a6650..40464012814 100644
--- a/usr.sbin/httpd/httpd.c
+++ b/usr.sbin/httpd/httpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: httpd.c,v 1.65 2017/03/25 17:25:34 claudio Exp $	*/
+/*	$OpenBSD: httpd.c,v 1.66 2017/04/04 20:16:09 claudio Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -322,7 +322,7 @@ parent_configure(struct httpd *env)
 
 	ret = 0;
 
-	config_purge(env, CONFIG_ALL);
+	config_purge(env, CONFIG_ALL & ~CONFIG_SERVERS);
 	return (ret);
 }