dovecot: If LDAP base contained variables, auth cache should hav...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/9e75e67420b4
changeset: 6999:9e75e67420b4
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Dec 20 23:01:03 2007 +0200
description:
If LDAP base contained variables, auth cache should have included them in
the cache key.

diffstat:

2 files changed, 4 insertions(+), 2 deletions(-)
src/auth/passdb-ldap.c |    3 ++-
src/auth/userdb-ldap.c |    3 ++-

diffs (26 lines):

diff -r 0375f2c0a1f6 -r 9e75e67420b4 src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Thu Dec 20 18:48:59 2007 +0200
+++ b/src/auth/passdb-ldap.c	Thu Dec 20 23:01:03 2007 +0200
@@ -435,7 +435,8 @@ passdb_ldap_preinit(struct auth_passdb *
 			  conn->set.auth_bind ? "password" : NULL);
 	module->module.cache_key =
 		auth_cache_parse_key(auth_passdb->auth->pool,
-				     conn->set.pass_filter);
+				     t_strconcat(conn->set.base,
+						 conn->set.pass_filter, NULL));
 	module->module.default_pass_scheme = conn->set.default_pass_scheme;
 	return &module->module;
 }
diff -r 0375f2c0a1f6 -r 9e75e67420b4 src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c	Thu Dec 20 18:48:59 2007 +0200
+++ b/src/auth/userdb-ldap.c	Thu Dec 20 23:01:03 2007 +0200
@@ -140,7 +140,8 @@ userdb_ldap_preinit(struct auth_userdb *
 			  conn->user_attr_map, NULL);
 	module->module.cache_key =
 		auth_cache_parse_key(auth_userdb->auth->pool,
-				     conn->set.user_filter);
+				     t_strconcat(conn->set.base,
+						 conn->set.user_filter, NULL));
 	return &module->module;
 }