From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 27 Feb 2017 14:23:09 +0000 (+0200)
Subject: master: Try to listen on master socket even if all services couldn't be listened to.
X-Git-Tag: 2.2.29.rc1~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d82bad3787af38001dc0d2673e0c67877065b4e3;p=thirdparty%2Fdovecot%2Fcore.git

master: Try to listen on master socket even if all services couldn't be listened to.

This could happen during a settings reload.
---

diff --git a/src/master/service-listen.c b/src/master/service-listen.c
index dad0f506ca..16b73483b1 100644
--- a/src/master/service-listen.c
+++ b/src/master/service-listen.c
@@ -367,8 +367,12 @@ int services_listen(struct service_list *service_list)
 		if (ret2 < ret)
 			ret = ret2;
 	}
-	if (ret > 0)
-		ret = services_listen_master(service_list);
+	/* reloading config wants to continue even when we're returning 0. */
+	if (ret >= 0) {
+		ret2 = services_listen_master(service_list);
+		if (ret2 < ret)
+			ret = ret2;
+	}
 
 #ifdef HAVE_SYSTEMD
 	if (ret > 0)