imap/pop3 proxy: Master user logins were broken by lib-sasl change.

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index e7faebc5dbf13bf5a86e9db2e7d4fcd0ba7f01f5..ba254de6b12d81d00bf8a0bcfa08c5f477f8967a 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -79,8 +79,9 @@ static int proxy_write_login(struct imap_client *client, string_t *str)
 
        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 --git a/src/pop3-login/pop3-proxy.c b/src/pop3-login/pop3-proxy.c
index b2daa4719dd9ab876758232ed592ca279475cbe3..beb8f2e2bda77f797f1a1ac42d34daa89af3e2c9 100644 (file)
--- a/src/pop3-login/pop3-proxy.c
+++ b/src/pop3-login/pop3-proxy.c
@@ -55,8 +55,9 @@ static int proxy_send_login(struct pop3_client *client, struct ostream *output)
 
        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);