[dovecot-cvs] dovecot/src/master main.c,1.80.2.1,1.80.2.2

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv6089

Modified Files:
      Tag: branch_1_0
	main.c 
Log Message:
If running from inetd, don't try to open/close listener sockets when
receiving SIGHUP.



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/main.c,v
retrieving revision 1.80.2.1
retrieving revision 1.80.2.2
diff -u -d -r1.80.2.1 -r1.80.2.2
--- main.c	8 Jun 2006 18:52:39 -0000	1.80.2.1
+++ main.c	11 Jun 2006 17:44:25 -0000	1.80.2.2
@@ -140,8 +140,10 @@
 	if (!master_settings_read(configfile, FALSE))
 		i_warning("Invalid configuration, keeping old one");
 	else {
-		listen_fds_close(old_set);
-		listen_fds_open(TRUE);
+		if (!IS_INETD()) {
+			listen_fds_close(old_set);
+			listen_fds_open(TRUE);
+		}
                 set_logfile(settings_root->defaults);
 	}
 }