dovecot-1.2: *-login: Don't assert-crash if trying to proxy caus...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/d1548d794f72
changeset: 9520:d1548d794f72
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Dec 23 13:22:21 2009 -0500
description:
*-login: Don't assert-crash if trying to proxy caused the connection to be killed.

diffstat:

2 files changed, 8 insertions(+), 4 deletions(-)
src/imap-login/client-authenticate.c |    6 ++++--
src/pop3-login/client-authenticate.c |    6 ++++--

diffs (32 lines):

diff -r d00abdaf9df2 -r d1548d794f72 src/imap-login/client-authenticate.c
--- 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 @@ static bool client_handle_args(struct im
 		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;
 	}
 
diff -r d00abdaf9df2 -r d1548d794f72 src/pop3-login/client-authenticate.c
--- 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 @@ static bool client_handle_args(struct po
 		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;
 	}