From: Timo Sirainen <tss@iki.fi>
Date: Fri, 9 Oct 2009 23:51:20 +0000 (-0400)
Subject: master: Fixed reloading configuration.
X-Git-Tag: 2.0.alpha1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59ee8d9c125b712d4549deffd480cce66f033749;p=thirdparty%2Fdovecot%2Fcore.git

master: Fixed reloading configuration.

--HG--
branch : HEAD
---

diff --git a/src/master/main.c b/src/master/main.c
index 45d1705784..8064dcabd2 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -353,6 +353,7 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED,
 			 services->config->config_file_path);
 
 	/* switch to new configuration. */
+	services_monitor_stop(services);
 	(void)services_listen_using(new_services, services);
 	services_destroy(services);
 
diff --git a/src/master/service-log.c b/src/master/service-log.c
index b7a8294a65..3742179d73 100644
--- a/src/master/service-log.c
+++ b/src/master/service-log.c
@@ -133,7 +133,8 @@ void services_log_deinit(struct service_list *service_list)
 			services[i]->log_process_internal_fd = -1;
 		}
 	}
-	service_process_notify_deinit(&service_list->log_byes);
+	if (service_list->log_byes != NULL)
+		service_process_notify_deinit(&service_list->log_byes);
 	if (service_list->master_log_fd[0] != -1) {
 		if (close(service_list->master_log_fd[0]) < 0)
 			i_error("close(master log fd) failed: %m");