[dovecot-cvs] dovecot/src/login-common main.c,1.13,1.14 master.c,1.7,1.8

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/login-common
In directory danu:/tmp/cvs-serv25762/login-common

Modified Files:
	main.c master.c 
Log Message:
bugfixes



Index: main.c
===================================================================
RCS file: /home/cvs/dovecot/src/login-common/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- main.c	22 Aug 2003 02:42:13 -0000	1.13
+++ main.c	22 Aug 2003 03:34:04 -0000	1.14
@@ -148,7 +148,6 @@
 	/* Refuse to run as root - we should never need it and it's
 	   dangerous with SSL. */
 	restrict_access_by_env(TRUE);
-	sleep(5);
 
 	/* make sure we can't fork() */
 	restrict_process_size((unsigned int)-1, 1);

Index: master.c
===================================================================
RCS file: /home/cvs/dovecot/src/login-common/master.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- master.c	22 Aug 2003 02:42:13 -0000	1.7
+++ master.c	22 Aug 2003 03:34:04 -0000	1.8
@@ -29,7 +29,9 @@
 	if (client == NULL)
 		i_fatal("Master sent reply with unknown tag %u", reply->tag);
 
+	client->master_tag = 0;
 	client->master_callback(client, reply->success);
+	client->master_callback = NULL;
 
 	hash_remove(master_requests, POINTER_CAST(reply->tag));
 }
@@ -60,10 +62,10 @@
 
 void master_request_abort(struct client *client)
 {
+	hash_remove(master_requests, POINTER_CAST(client->master_tag));
+
 	client->master_tag = 0;
 	client->master_callback = NULL;
-
-	hash_remove(master_requests, POINTER_CAST(client->master_tag));
 }
 
 void master_notify_finished(void)