dovecot-2.0-sslstream: If connect() fails to UNIX config socket,...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/582659cebfdf
changeset: 10190:582659cebfdf
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Oct 26 19:32:23 2009 -0400
description:
If connect() fails to UNIX config socket, don't try to exec doveconf.

diffstat:

1 file changed, 3 insertions(+), 2 deletions(-)
src/lib-master/master-service-settings.c |    5 +++--

diffs (15 lines):

diff -r affb52c62add -r 582659cebfdf src/lib-master/master-service-settings.c
--- 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 @@ master_service_read_config(struct master
 			*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);
 			}