[dovecot-cvs] dovecot/src/imap-login client.c,1.4,1.5

[cras at procontrol.fi]

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

Modified Files:
	client.c 
Log Message:
STARTTLS handshake failure fixes.



Index: client.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap-login/client.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- client.c	2 Feb 2003 10:46:20 -0000	1.4
+++ client.c	8 Feb 2003 14:09:27 -0000	1.5
@@ -140,13 +140,13 @@
 		imap_parser_destroy(client->parser);
 
 		client_open_streams(client, fd_ssl);
+		client->common.io = io_add(client->common.fd, IO_READ,
+					   client_input, client);
 	} else {
-		client_send_line(client, " * BYE TLS handehake failed.");
-		client_destroy(client, "TLS handshake failed");
+		client_send_line(client, "* BYE TLS initialization failed.");
+		client_destroy(client, "TLS initialization failed.");
 	}
 
-	client->common.io =
-		io_add(client->common.fd, IO_READ, client_input, client);
 	return TRUE;
 }
 
@@ -376,8 +376,10 @@
 		client->common.io = NULL;
 	}
 
-	net_disconnect(client->common.fd);
-	client->common.fd = -1;
+	if (client->common.fd != -1) {
+		net_disconnect(client->common.fd);
+		client->common.fd = -1;
+	}
 
 	i_free(client->common.virtual_user);
 	client_unref(client);