Do not purge the CONFIG_SERVERS config in the parent. The ticket code uses
authorclaudio <claudio@openbsd.org>
Tue, 4 Apr 2017 20:16:09 +0000 (20:16 +0000)
committerclaudio <claudio@openbsd.org>
Tue, 4 Apr 2017 20:16:09 +0000 (20:16 +0000)
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@

usr.sbin/httpd/httpd.c

index 879845a..4046401 100644 (file)
@@ -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);
 }