dovecot-2.2: imap/pop3 proxy: Master user logins were broken by ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/ba720ff91a75
changeset: 16529:ba720ff91a75
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jun 18 11:59:21 2013 +0300
description:
imap/pop3 proxy: Master user logins were broken by lib-sasl change.

diffstat:

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

diffs (30 lines):

diff -r 1352949265cc -r ba720ff91a75 src/imap-login/imap-proxy.c
--- a/src/imap-login/imap-proxy.c	Mon Jun 17 16:37:46 2013 +0300
+++ b/src/imap-login/imap-proxy.c	Tue Jun 18 11:59:21 2013 +0300
@@ -79,8 +79,9 @@
 
 	i_assert(client->common.proxy_sasl_client == NULL);
 	memset(&sasl_set, 0, sizeof(sasl_set));
-	sasl_set.authid = client->common.proxy_user;
-	sasl_set.authzid = client->common.proxy_master_user;
+	sasl_set.authid = client->common.proxy_master_user != NULL ?
+		client->common.proxy_master_user : client->common.proxy_user;
+	sasl_set.authzid = client->common.proxy_user;
 	sasl_set.password = client->common.proxy_password;
 	client->common.proxy_sasl_client =
 		sasl_client_new(client->common.proxy_mech, &sasl_set);
diff -r 1352949265cc -r ba720ff91a75 src/pop3-login/pop3-proxy.c
--- a/src/pop3-login/pop3-proxy.c	Mon Jun 17 16:37:46 2013 +0300
+++ b/src/pop3-login/pop3-proxy.c	Tue Jun 18 11:59:21 2013 +0300
@@ -55,8 +55,9 @@
 
 	i_assert(client->common.proxy_sasl_client == NULL);
 	memset(&sasl_set, 0, sizeof(sasl_set));
-	sasl_set.authid = client->common.proxy_user;
-	sasl_set.authzid = client->common.proxy_master_user;
+	sasl_set.authid = client->common.proxy_master_user != NULL ?
+		client->common.proxy_master_user : client->common.proxy_user;
+	sasl_set.authzid = client->common.proxy_user;
 	sasl_set.password = client->common.proxy_password;
 	client->common.proxy_sasl_client =
 		sasl_client_new(client->common.proxy_mech, &sasl_set);