[dovecot-cvs] dovecot/src/master auth-process.c, 1.88, 1.89 dict-process.c, 1.5, 1.6

[cras at dovecot.org]

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

Modified Files:
	auth-process.c dict-process.c 
Log Message:
Call io_remove() before closing the fd. It's required by kqueue.



Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- auth-process.c	22 Jan 2006 11:33:30 -0000	1.88
+++ auth-process.c	29 Jan 2006 12:14:49 -0000	1.89
@@ -345,9 +345,9 @@
 			       dec2str(p->pid));
 	(void)unlink(path);
 
+	io_remove(&p->worker_io);
 	if (close(p->worker_listen_fd) < 0)
 		i_error("close(worker_listen) failed: %m");
-	io_remove(&p->worker_io);
 
 	iter = hash_iterate_init(p->requests);
 	while (hash_iterate(iter, &key, &value))

Index: dict-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/dict-process.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dict-process.c	15 Jan 2006 14:22:20 -0000	1.5
+++ dict-process.c	29 Jan 2006 12:14:49 -0000	1.6
@@ -138,11 +138,11 @@
 	if (process->fd == -1)
 		return;
 
+	io_remove(&process->io);
+
 	if (close(process->fd) < 0)
 		i_error("close(dict) failed: %m");
 	process->fd = -1;
-
-	io_remove(&process->io);
 }
 
 void dict_process_init(void)