# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1453550719 -7200
# Node ID e250af038f2dba64e29cf4efba345a766381179b
# Parent  a3906195883287c9b158941f5f1b2fde273c0f72
ldap auth: %variables in pass/user_attrs are now included in auth cache key.

This makes sure that the result won't be cached too aggressively, for example
if %{lport} or %{rip} was used as a field's value. Although each of these
fields just makes the cache less effective, so it's a good idea to avoid
variables entirely in the pass/user_attrs. An alternative is to use
passdb/userdb { override_fields }

diff -r a39061958832 -r e250af038f2d src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Sat Jan 23 13:57:54 2016 +0200
+++ b/src/auth/passdb-ldap.c	Sat Jan 23 14:05:19 2016 +0200
@@ -439,6 +439,7 @@
 	module->module.cache_key =
 		auth_cache_parse_key(pool,
 				     t_strconcat(conn->set.base,
+						 conn->set.pass_attrs,
 						 conn->set.pass_filter, NULL));
 	module->module.default_pass_scheme = conn->set.default_pass_scheme;
 	return &module->module;
diff -r a39061958832 -r e250af038f2d src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c	Sat Jan 23 13:57:54 2016 +0200
+++ b/src/auth/userdb-ldap.c	Sat Jan 23 14:05:19 2016 +0200
@@ -269,6 +269,7 @@
 	module->module.cache_key =
 		auth_cache_parse_key(pool,
 				     t_strconcat(conn->set.base,
+						 conn->set.user_attrs,
 						 conn->set.user_filter, NULL));
 	return &module->module;
 }