Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9520:d1548d794f72 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*-login: Don't assert-crash if trying to proxy caused the connection to be killed.
author Timo Sirainen <tss@iki.fi>
date Wed, 23 Dec 2009 13:22:21 -0500
parents d00abdaf9df2
children 56dd8c276ed6
files src/imap-login/client-authenticate.c src/pop3-login/client-authenticate.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client-authenticate.c	Wed Dec 23 13:02:55 2009 -0500
+++ b/src/imap-login/client-authenticate.c	Wed Dec 23 13:22:21 2009 -0500
@@ -194,8 +194,10 @@
 		if (!success)
 			return FALSE;
 		if (imap_proxy_new(client, host, port, destuser, master_user,
-				   pass, ssl_flags, proxy_timeout_msecs) < 0)
-			client_auth_failed(client, TRUE);
+				   pass, ssl_flags, proxy_timeout_msecs) < 0) {
+			if (!client->destroyed)
+				client_auth_failed(client, TRUE);
+		}
 		return TRUE;
 	}
 
--- a/src/pop3-login/client-authenticate.c	Wed Dec 23 13:02:55 2009 -0500
+++ b/src/pop3-login/client-authenticate.c	Wed Dec 23 13:22:21 2009 -0500
@@ -193,8 +193,10 @@
 		if (!success)
 			return FALSE;
 		if (pop3_proxy_new(client, host, port, destuser, master_user,
-				   pass, ssl_flags, proxy_timeout_msecs) < 0)
-			client_auth_failed(client, TRUE);
+				   pass, ssl_flags, proxy_timeout_msecs) < 0) {
+			if (!client->destroyed)
+				client_auth_failed(client, TRUE);
+		}
 		return TRUE;
 	}