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

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.0/rev/2cedab21cd6d
changeset: 5493:2cedab21cd6d
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Dec 20 23:01:04 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 d81c10f9b8ec -r 2cedab21cd6d src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Tue Dec 11 21:00:14 2007 +0200
+++ b/src/auth/passdb-ldap.c	Thu Dec 20 23:01:04 2007 +0200
@@ -519,7 +519,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 d81c10f9b8ec -r 2cedab21cd6d src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c	Tue Dec 11 21:00:14 2007 +0200
+++ b/src/auth/userdb-ldap.c	Thu Dec 20 23:01:04 2007 +0200
@@ -231,7 +231,8 @@ userdb_ldap_preinit(struct auth_userdb *
 			  conn->user_attr_map, default_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;
 }