[dovecot-cvs] dovecot/src/auth passdb-ldap.c, 1.21, 1.22 userdb-ldap.c, 1.25, 1.26

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv2167

Modified Files:
	passdb-ldap.c userdb-ldap.c 
Log Message:
Fixes by Kazuo Moriwaka



Index: passdb-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-ldap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- passdb-ldap.c	13 Jan 2005 18:37:00 -0000	1.21
+++ passdb-ldap.c	16 Jan 2005 17:11:49 -0000	1.22
@@ -160,6 +160,7 @@
 	var_expand(str, conn->set.base, vars);
 	base = t_strdup(str_c(str));
 
+	str_truncate(str, 0);
 	var_expand(str, conn->set.pass_filter, vars);
 	filter = str_c(str);
 
@@ -169,7 +170,7 @@
 
 	auth_request_log_debug(auth_request, "ldap",
 			       "base=%s scope=%s filter=%s fields=%s",
-			       conn->set.base, conn->set.scope, filter,
+			       base, conn->set.scope, filter,
 			       t_strarray_join(attr_names, ","));
 
 	db_ldap_search(conn, base, conn->set.ldap_scope,

Index: userdb-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/userdb-ldap.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- userdb-ldap.c	13 Jan 2005 18:37:00 -0000	1.25
+++ userdb-ldap.c	16 Jan 2005 17:11:49 -0000	1.26
@@ -173,6 +173,7 @@
 	var_expand(str, conn->set.base, vars);
 	base = t_strdup(str_c(str));
 
+	str_truncate(str, 0);
 	var_expand(str, conn->set.user_filter, vars);
 	filter = str_c(str);
 
@@ -184,7 +185,7 @@
 
 	auth_request_log_debug(auth_request, "ldap",
 			       "base=%s scope=%s filter=%s fields=%s",
-			       conn->set.base, conn->set.scope, filter,
+			       base, conn->set.scope, filter,
 			       t_strarray_join(attr_names, ","));
 
 	db_ldap_search(conn, base, conn->set.ldap_scope,