dovecot-2.1: auth: Don't add "master" to passdb reply if the pas...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/1bc8f7b823e7
changeset: 14684:1bc8f7b823e7
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Aug 24 15:12:32 2012 +0300
description:
auth: Don't add "master" to passdb reply if the passdb itself already added it.

diffstat:

 src/auth/auth-request-handler.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 5590c1dc04cd -r 1bc8f7b823e7 src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c	Fri Aug 24 12:25:55 2012 +0300
+++ b/src/auth/auth-request-handler.c	Fri Aug 24 15:12:32 2012 +0300
@@ -186,7 +186,8 @@
 			auth_stream_reply_add(reply, "pass",
 					      request->mech_password);
 		}
-		if (request->master_user != NULL) {
+		if (request->master_user != NULL &&
+		    auth_stream_reply_find(reply, "master") == NULL) {
 			/* the master username needs to be forwarded */
 			auth_stream_reply_add(reply, "master",
 					      request->master_user);