[dovecot-cvs] dovecot/src/master Makefile.am, 1.16, 1.17 auth-process.c, 1.84, 1.85 common.h, 1.22, 1.23 main.c, 1.67, 1.68

[cras at dovecot.org]

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

Modified Files:
	Makefile.am auth-process.c common.h main.c 
Log Message:
Start dict server automatically when a client tries to connect to it.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	2 Dec 2005 12:53:27 -0000	1.16
+++ Makefile.am	11 Jan 2006 23:47:03 -0000	1.17
@@ -18,6 +18,7 @@
 
 dovecot_SOURCES = \
 	auth-process.c \
+	dict-process.c \
 	log.c \
 	login-process.c \
 	mail-process.c \
@@ -30,6 +31,7 @@
 
 noinst_HEADERS = \
 	auth-process.h \
+	dict-process.h \
 	common.h \
 	log.h \
 	login-process.h \

Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- auth-process.c	30 Dec 2005 18:02:50 -0000	1.84
+++ auth-process.c	11 Jan 2006 23:47:03 -0000	1.85
@@ -608,7 +608,7 @@
 		i_fatal("dup2(stderr) failed: %m");
 
 	if (dup2(fd, 4) < 0)
-		i_fatal("dup2(stdin) failed: %m");
+		i_fatal("dup2(4) failed: %m");
 
 	for (i = 0; i <= 2; i++)
 		fd_close_on_exec(i, FALSE);

Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/common.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- common.h	28 Feb 2005 22:19:21 -0000	1.22
+++ common.h	11 Jan 2006 23:47:03 -0000	1.23
@@ -15,6 +15,7 @@
 	PROCESS_TYPE_IMAP,
 	PROCESS_TYPE_POP3,
 	PROCESS_TYPE_SSL_PARAM,
+	PROCESS_TYPE_DICT,
 
 	PROCESS_TYPE_MAX
 };

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/main.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- main.c	2 Dec 2005 12:53:28 -0000	1.67
+++ main.c	11 Jan 2006 23:47:03 -0000	1.68
@@ -9,6 +9,7 @@
 #include "write-full.h"
 
 #include "auth-process.h"
+#include "dict-process.h"
 #include "login-process.h"
 #include "mail-process.h"
 #include "syslog-util.h"
@@ -193,11 +194,18 @@
 		process_type = PID_GET_PROCESS_TYPE(pid);
 		PID_REMOVE_PROCESS_TYPE(pid);
 
-		if (process_type == PROCESS_TYPE_IMAP ||
-		    process_type == PROCESS_TYPE_POP3)
+		switch (process_type) {
+		case PROCESS_TYPE_IMAP:
+		case PROCESS_TYPE_POP3:
 			mail_process_destroyed(pid);
-		if (process_type == PROCESS_TYPE_SSL_PARAM)
+			break;
+		case PROCESS_TYPE_SSL_PARAM:
 			ssl_parameter_process_destroyed(pid);
+			break;
+		case PROCESS_TYPE_DICT:
+			dict_process_restart();
+			break;
+		}
 
 		/* write errors to syslog */
 		process_type_name = process_names[process_type];
@@ -540,6 +548,7 @@
 	to = timeout_add(100, timeout_handler, NULL);
 
 	ssl_init();
+	dict_process_init();
 	auth_processes_init();
 	login_processes_init();
 
@@ -557,6 +566,7 @@
 
 	login_processes_deinit();
 	auth_processes_deinit();
+	dict_process_deinit();
 	ssl_deinit();
 
 	timeout_remove(to);