From: Timo Sirainen <tss@iki.fi>
Date: Tue, 23 Jun 2009 21:31:29 +0000 (-0400)
Subject: lib-master: Don't try to close(-1)
X-Git-Tag: 2.0.alpha1~535
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13fc05b4fae8583f090901702031c4f0e8bf135d;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Don't try to close(-1)

--HG--
branch : HEAD
---

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 884e147b93..d65817b067 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -232,10 +232,10 @@ int master_service_settings_read(struct master_service *service,
 		}
 	}
 
-	if ((service->flags & MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN) == 0)
-		(void)close(fd);
-	else
+	if ((service->flags & MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN) != 0)
 		service->config_fd = fd;
+	else if (fd != -1)
+		(void)close(fd);
 
 	/* let environment override settings. especially useful for the
 	   settings from userdb. */