dovecot/sme7/dovecot-1.0-CVE-2007-6598.patch

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 6c432af..69624a1 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -519,7 +519,8 @@ passdb_ldap_preinit(struct auth_passdb *auth_passdb, const char *args)
                          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 --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 05f6eb7..9150654 100644
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -231,7 +231,8 @@ userdb_ldap_preinit(struct auth_userdb *auth_userdb, const char *args)
                          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;
 }
 
1	diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
2	index 6c432af..69624a1 100644
3	--- a/src/auth/passdb-ldap.c
4	+++ b/src/auth/passdb-ldap.c
5	@@ -519,7 +519,8 @@ passdb_ldap_preinit(struct auth_passdb auth_passdb, const char args)
6	conn->set.auth_bind ? "password" : NULL);
7	module->module.cache_key =
8	auth_cache_parse_key(auth_passdb->auth->pool,
9	- conn->set.pass_filter);
10	+ t_strconcat(conn->set.base,
11	+ conn->set.pass_filter, NULL));
12	module->module.default_pass_scheme = conn->set.default_pass_scheme;
13	return &module->module;
14	}
15	diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
16	index 05f6eb7..9150654 100644
17	--- a/src/auth/userdb-ldap.c
18	+++ b/src/auth/userdb-ldap.c
19	@@ -231,7 +231,8 @@ userdb_ldap_preinit(struct auth_userdb auth_userdb, const char args)
20	conn->user_attr_map, default_attr_map, NULL);
21	module->module.cache_key =
22	auth_cache_parse_key(auth_userdb->auth->pool,
23	- conn->set.user_filter);
24	+ t_strconcat(conn->set.base,
25	+ conn->set.user_filter, NULL));
26	return &module->module;
27	}
28