]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
If connect() fails to UNIX config socket, don't try to exec doveconf.
authorTimo Sirainen <tss@iki.fi>
Mon, 26 Oct 2009 23:32:23 +0000 (19:32 -0400)
committerTimo Sirainen <tss@iki.fi>
Mon, 26 Oct 2009 23:32:23 +0000 (19:32 -0400)
--HG--
branch : HEAD

src/lib-master/master-service-settings.c

index 2cf82bc8fc464261cc4697be4e0c2dc80e2caad9..72b6237c8427748b3be606ef8073944cff4f1327 100644 (file)
@@ -118,8 +118,9 @@ master_service_read_config(struct master_service *service, const char *path,
                        *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);
                        }