Mercurial > dovecot > core-2.2
changeset 21755:2a8ac5c1c458
master: Try to listen on master socket even if all services couldn't be listened to.
This could happen during a settings reload.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Mon, 27 Feb 2017 16:23:09 +0200 |
| parents | 91a26e7f6a9c |
| children | 014edbaf5ab6 |
| files | src/master/service-listen.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/master/service-listen.c Mon Feb 27 16:22:52 2017 +0200 +++ b/src/master/service-listen.c Mon Feb 27 16:23:09 2017 +0200 @@ -367,8 +367,12 @@ 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)