[dovecot-cvs] dovecot/src/login client-authenticate.c,1.15,1.16 client.c,1.13,1.14

[cras at procontrol.fi]

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

Modified Files:
	client-authenticate.c client.c 
Log Message:
Make sure we're not doing io_remove() for already removed IO.



Index: client-authenticate.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/client-authenticate.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- client-authenticate.c	13 Nov 2002 11:08:18 -0000	1.15
+++ client-authenticate.c	20 Nov 2002 19:49:11 -0000	1.16
@@ -209,8 +209,10 @@
 	if (auth_init_request(AUTH_METHOD_PLAIN,
 			      login_callback, client, &error)) {
 		/* don't read any input from client until login is finished */
-		io_remove(client->io);
-		client->io = NULL;
+		if (client->io != NULL) {
+			io_remove(client->io);
+			client->io = NULL;
+		}
 		return TRUE;
 	} else {
 		client_send_tagline(client, t_strconcat(
@@ -296,7 +298,8 @@
 	if (auth_init_request(method->method, authenticate_callback,
 			      client, &error)) {
 		/* following input data will go to authentication */
-		io_remove(client->io);
+		if (client->io != NULL)
+			io_remove(client->io);
 		client->io = io_add(client->fd, IO_READ,
 				    client_auth_input, client);
 	} else {

Index: client.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/client.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- client.c	20 Nov 2002 19:30:31 -0000	1.13
+++ client.c	20 Nov 2002 19:49:11 -0000	1.14
@@ -55,8 +55,10 @@
 
 	/* must be removed before ssl_proxy_new(), since it may
 	   io_add() the same fd. */
-	io_remove(client->io);
-	client->io = NULL;
+	if (client->io != NULL) {
+		io_remove(client->io);
+		client->io = NULL;
+	}
 
 	fd_ssl = ssl_proxy_new(client->fd);
 	if (fd_ssl != -1) {