From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 27 Feb 2017 14:22:08 +0000 (+0200)
Subject: master: Don't crash if master socket couldn't be re-opened after settings reload.
X-Git-Tag: 2.3.0.rc1~1982
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7369eabcd8d67bef57c2b5d72d37b7181a3ff4d7;p=thirdparty%2Fdovecot%2Fcore.git

master: Don't crash if master socket couldn't be re-opened after settings reload.
---

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index bb3f04f589..92935d9d34 100644
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -453,7 +453,8 @@ void services_monitor_start(struct service_list *service_list)
 		return;
 	service_anvil_monitor_start(service_list);
 
-	if (service_list->io_master == NULL) {
+	if (service_list->io_master == NULL &&
+	    service_list->master_fd != -1) {
 		service_list->io_master =
 			io_add(service_list->master_fd, IO_READ,
 			       master_client_connected, service_list);