Commit Diff

Commit:
4c0ae0c3cf2253e2e929fcb85c907f3a17116e1f
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
listener: correctly swap config after reload and don't forget to free the current config!
Actions:
Patch | Tree
commit - d70ef5541a28814243c1693e1697b51ae90d2e2e
commit + 4c0ae0c3cf2253e2e929fcb85c907f3a17116e1f
blob - 42d0c63de4b6a0db4b3a6d91d935672eed1f7396
blob + 4022322122fd289cec715309ee170891d58a5d37
--- kamid/listener.c
+++ kamid/listener.c
@@ -257,7 +257,6 @@ listener_receive_config(struct imsg *imsg, struct kd_c
 		if (*nconf == NULL)
 			fatalx("%s: IMSG_RECONF_END without "
 			    "IMSG_RECONF_CONF", __func__);
-		/* merge_config(listener_conf, nconf); */
 		apply_config(*nconf);
 		*nconf = NULL;
 		break;
@@ -547,6 +546,8 @@ apply_config(struct kd_conf *conf)
 	struct kd_pki_conf *pki;
 	struct kd_listen_conf *listen;
 
+	/* swap the now config with the current one */
+	clear_config(listener_conf);
 	listener_conf = conf;
 
 	/* prepare the various tls_config */