From: Timo Sirainen <tss@iki.fi>
Date: Fri, 4 Sep 2009 21:14:47 +0000 (-0400)
Subject: lib-master: Don't assert-crash if process gets a signal while reading config.
X-Git-Tag: 2.0.alpha1~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=924ee34de38fb439e425318f78cb478717bfb030;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Don't assert-crash if process gets a signal while reading config.

--HG--
branch : HEAD
---

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index fa2bf65ec1..24c9384164 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -223,6 +223,7 @@ int master_service_settings_read(struct master_service *service,
 
 	if (fd != -1) {
 		istream = i_stream_create_fd(fd, (size_t)-1, FALSE);
+		istream->blocking = TRUE; /* fd is blocking */
 		ret = settings_parse_stream_read(parser, istream);
 		i_stream_unref(&istream);
 		i_assert(ret <= 0);