dovecot-2.0: master: Fixed reloading configuration.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/940d11bc5039
changeset: 10027:940d11bc5039
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 09 19:51:20 2009 -0400
description:
master: Fixed reloading configuration.

diffstat:

2 files changed, 3 insertions(+), 1 deletion(-)
src/master/main.c        |    1 +
src/master/service-log.c |    3 ++-

diffs (24 lines):

diff -r 4442b6aa5a66 -r 940d11bc5039 src/master/main.c
--- a/src/master/main.c	Fri Oct 09 19:05:47 2009 -0400
+++ b/src/master/main.c	Fri Oct 09 19:51:20 2009 -0400
@@ -353,6 +353,7 @@ sig_settings_reload(const siginfo_t *si 
 			 services->config->config_file_path);
 
 	/* switch to new configuration. */
+	services_monitor_stop(services);
 	(void)services_listen_using(new_services, services);
 	services_destroy(services);
 
diff -r 4442b6aa5a66 -r 940d11bc5039 src/master/service-log.c
--- a/src/master/service-log.c	Fri Oct 09 19:05:47 2009 -0400
+++ b/src/master/service-log.c	Fri Oct 09 19:51:20 2009 -0400
@@ -133,7 +133,8 @@ void services_log_deinit(struct service_
 			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");