[dovecot-cvs] dovecot/src/auth passdb-ldap.c,1.29,1.30

[cras at dovecot.org]

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

Modified Files:
	passdb-ldap.c 
Log Message:
Added more LDAP debugging.



Index: passdb-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-ldap.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- passdb-ldap.c	17 Apr 2005 16:52:00 -0000	1.29
+++ passdb-ldap.c	23 Apr 2005 15:46:21 -0000	1.30
@@ -46,14 +46,30 @@
 	const char *name;
 	char *attr, **vals;
 	unsigned int i;
+	string_t *debug = NULL;
 
 	attr = ldap_first_attribute(conn->ld, entry, &ber);
 	while (attr != NULL) {
 		name = hash_lookup(passdb_ldap_conn->pass_attr_map, attr);
 		vals = ldap_get_values(conn->ld, entry, attr);
 
+		if (auth_request->auth->verbose_debug) {
+			if (debug == NULL)
+				debug = t_str_new(256);
+			else
+				str_append_c(debug, ' ');
+			str_append(debug, attr);
+			str_printfa(debug, "(%s)=",
+				    name != NULL ? name : "?unknown?");
+		}
+
 		if (name != NULL && vals != NULL) {
 			for (i = 0; vals[i] != NULL; i++) {
+				if (debug != NULL) {
+					if (i != 0)
+						str_append_c(debug, '/');
+					str_append(debug, vals[i]);
+				}
 				auth_request_set_field(auth_request,
 						name, vals[i],
 						conn->set.default_pass_scheme);
@@ -65,6 +81,11 @@
 
 		attr = ldap_next_attribute(conn->ld, entry, ber);
 	}
+
+	if (debug != NULL) {
+		auth_request_log_debug(auth_request, "ldap",
+				       "%s", str_c(debug));
+	}
 }
 
 static void handle_request(struct ldap_connection *conn,