changeset 10189:582659cebfdf HEAD

If connect() fails to UNIX config socket, don't try to exec doveconf.
author Timo Sirainen <tss@iki.fi>
date Mon, 26 Oct 2009 19:32:23 -0400
parents affb52c62add
children e758ed7c2cb4
files src/lib-master/master-service-settings.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-master/master-service-settings.c	Mon Oct 26 18:52:10 2009 -0400
+++ b/src/lib-master/master-service-settings.c	Mon Oct 26 19:32:23 2009 -0400
@@ -118,8 +118,9 @@
 			*error_r = t_strdup_printf(
 				"net_connect_unix(%s) failed: %m", path);
 
-			if (stat(path, &st) == 0 && !S_ISFIFO(st.st_mode)) {
-				/* it's a file, not a socket */
+			if (stat(path, &st) == 0 && 
+			    !S_ISSOCK(st.st_mode) && !S_ISFIFO(st.st_mode)) {
+				/* it's a file, not a socket/pipe */
 				master_service_exec_config(service,
 							   input->preserve_home);
 			}