dovecot-2.1: login proxy: If remote auth fails, say so in discon...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/cb344eb79daa
changeset: 14011:cb344eb79daa
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 27 19:31:58 2012 +0200
description:
login proxy: If remote auth fails, say so in disconnect message instead of "internal failure".

diffstat:

 src/imap-login/imap-proxy.c      |  1 +
 src/login-common/client-common.c |  2 ++
 src/login-common/client-common.h |  1 +
 src/pop3-login/pop3-proxy.c      |  1 +
 4 files changed, 5 insertions(+), 0 deletions(-)

diffs (45 lines):

diff -r 7767d168c994 -r cb344eb79daa src/imap-login/imap-proxy.c
--- a/src/imap-login/imap-proxy.c	Fri Jan 27 17:16:46 2012 +0200
+++ b/src/imap-login/imap-proxy.c	Fri Jan 27 19:31:58 2012 +0200
@@ -264,6 +264,7 @@
 					 AUTH_FAILED_MSG);
 		}
 
+		client->proxy_auth_failed = TRUE;
 		client_proxy_failed(client, FALSE);
 		return -1;
 	} else if (strncasecmp(line, "* CAPABILITY ", 13) == 0) {
diff -r 7767d168c994 -r cb344eb79daa src/login-common/client-common.c
--- a/src/login-common/client-common.c	Fri Jan 27 17:16:46 2012 +0200
+++ b/src/login-common/client-common.c	Fri Jan 27 19:31:58 2012 +0200
@@ -562,6 +562,8 @@
 	if (client->auth_process_comm_fail)
 		return "(auth process communication failure)";
 
+	if (client->proxy_auth_failed)
+		return "(proxy dest auth failed)";
 	if (client->auth_successes > 0) {
 		return t_strdup_printf("(internal failure, %u succesful auths)",
 				       client->auth_successes);
diff -r 7767d168c994 -r cb344eb79daa src/login-common/client-common.h
--- a/src/login-common/client-common.h	Fri Jan 27 17:16:46 2012 +0200
+++ b/src/login-common/client-common.h	Fri Jan 27 19:31:58 2012 +0200
@@ -134,6 +134,7 @@
 	unsigned int auth_try_aborted:1;
 	unsigned int auth_initializing:1;
 	unsigned int auth_process_comm_fail:1;
+	unsigned int proxy_auth_failed:1;
 	unsigned int auth_waiting:1;
 	/* ... */
 };
diff -r 7767d168c994 -r cb344eb79daa src/pop3-login/pop3-proxy.c
--- a/src/pop3-login/pop3-proxy.c	Fri Jan 27 17:16:46 2012 +0200
+++ b/src/pop3-login/pop3-proxy.c	Fri Jan 27 19:31:58 2012 +0200
@@ -156,6 +156,7 @@
 			line += 5;
 		client_proxy_log_failure(client, line);
 	}
+	client->proxy_auth_failed = TRUE;
 	client_proxy_failed(client, FALSE);
 	return -1;
 }