dovecot-2.1: auth: Avoid adding duplicate extra fields to auth r...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/05940646a0f4
changeset: 13956:05940646a0f4
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jan 19 16:17:52 2012 +0200
description:
auth: Avoid adding duplicate extra fields to auth replies.
This especially fixes default_fields/override_fields.

diffstat:

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

diffs (19 lines):

diff -r 057477461add -r 05940646a0f4 src/auth/auth-request.c
--- a/src/auth/auth-request.c	Thu Jan 19 16:16:56 2012 +0200
+++ b/src/auth/auth-request.c	Thu Jan 19 16:17:52 2012 +0200
@@ -1151,6 +1151,7 @@
 
 	if (request->extra_fields == NULL)
 		request->extra_fields = auth_stream_reply_init(request->pool);
+	auth_stream_reply_remove(request->extra_fields, name);
 	auth_stream_reply_add(request->extra_fields, name, value);
 }
 
@@ -1366,6 +1367,7 @@
 		name = "system_groups_user";
 	}
 
+	auth_stream_reply_remove(request->userdb_reply, name);
 	auth_stream_reply_add(request->userdb_reply, name, value);
 }