[dovecot-cvs] dovecot/src/auth db-ldap.c,1.41.2.6,1.41.2.7

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	db-ldap.c 
Log Message:
"Can't connect to server" message's host was wrong if uris setting was used.



Index: db-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-ldap.c,v
retrieving revision 1.41.2.6
retrieving revision 1.41.2.7
diff -u -d -r1.41.2.6 -r1.41.2.7
--- db-ldap.c	19 Jun 2006 16:14:34 -0000	1.41.2.6
+++ db-ldap.c	22 Sep 2006 13:26:44 -0000	1.41.2.7
@@ -351,7 +351,8 @@
 	}
 	if (ret == LDAP_SERVER_DOWN) {
 		i_error("LDAP: Can't connect to server: %s",
-			conn->set.hosts);
+			conn->set.uris != NULL ?
+			conn->set.uris : conn->set.hosts);
 		return FALSE;
 	}
 	if (ret != LDAP_SUCCESS) {