dovecot: Login processes started by inetd aren't ours, don't tre...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/66e5f514355e
changeset: 6519:66e5f514355e
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 30 18:03:18 2007 +0300
description:
Login processes started by inetd aren't ours, don't treat them as such.

diffstat:

1 file changed, 7 insertions(+), 5 deletions(-)
src/master/login-process.c |   12 +++++++-----

diffs (47 lines):

diff -r 9b71007b70c7 -r 66e5f514355e src/master/login-process.c
--- a/src/master/login-process.c	Sun Sep 30 17:51:25 2007 +0300
+++ b/src/master/login-process.c	Sun Sep 30 18:03:18 2007 +0300
@@ -435,7 +435,8 @@ static void login_process_input(struct l
 }
 
 static struct login_process *
-login_process_new(struct login_group *group, pid_t pid, int fd)
+login_process_new(struct login_group *group, pid_t pid, int fd,
+		  bool inetd_child)
 {
 	struct login_process *p;
 
@@ -447,10 +448,12 @@ login_process_new(struct login_group *gr
 	p->refcount = 2; /* once for fd close, another for process exit */
 	p->pid = pid;
 	p->fd = fd;
+	p->inetd_child = inetd_child;
 	p->io = io_add(fd, IO_READ, login_process_input, p);
 	p->output = o_stream_create_fd(fd, sizeof(struct master_login_reply)*10,
 				       FALSE);
-	child_process_add(pid, &p->process);
+	if (!inetd_child)
+		child_process_add(pid, &p->process);
 
 	p->state = LOGIN_STATE_LISTENING;
 
@@ -627,7 +630,7 @@ static pid_t create_login_process(struct
 
 		net_set_nonblock(fd[0], TRUE);
 		fd_close_on_exec(fd[0], TRUE);
-		(void)login_process_new(group, pid, fd[0]);
+		(void)login_process_new(group, pid, fd[0], FALSE);
 		(void)close(fd[1]);
 		(void)close(log_fd);
 		return pid;
@@ -907,9 +910,8 @@ static void inetd_login_accept(void *con
 		net_set_nonblock(fd, TRUE);
 		fd_close_on_exec(fd, TRUE);
 
-		p = login_process_new(NULL, ++login_pid_counter, fd);
+		p = login_process_new(NULL, ++login_pid_counter, fd, TRUE);
 		p->initialized = TRUE;
-		p->inetd_child = TRUE;
 	}
 }