dovecot-2.2: auth: If multiple userdbs are used, default_fields ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f3ed414944b8
changeset: 19109:f3ed414944b8
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 07 21:02:51 2015 +0300
description:
auth: If multiple userdbs are used, default_fields was ignored for all but the first one.

diffstat:

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

diffs (16 lines):

diff -r 3ebba506c2c7 -r f3ed414944b8 src/auth/auth-request.c
--- a/src/auth/auth-request.c	Mon Sep 07 20:24:25 2015 +0300
+++ b/src/auth/auth-request.c	Mon Sep 07 21:02:51 2015 +0300
@@ -1148,6 +1148,12 @@
 	request->userdb_lookup = TRUE;
 	if (request->userdb_reply == NULL)
 		auth_request_init_userdb_reply(request);
+	else {
+		/* we still want to set default_fields. these override any
+		   existing fields set by previous userdbs (because if that is
+		   unwanted, ":protected" can be used). */
+		userdb_template_export(userdb->default_fields_tmpl, request);
+	}
 
 	/* (for now) auth_cache is shared between passdb and userdb */
 	cache_key = passdb_cache == NULL ? NULL : userdb->cache_key;