--- servers/slapd/back-ldap/chain.c	2006/04/02 21:47:13	1.52
+++ servers/slapd/back-ldap/chain.c	2006/05/15 17:04:42	1.52.2.1
@@ -1,5 +1,5 @@
 /* chain.c - chain LDAP operations */
-/* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/chain.c,v 1.51 2006/03/26 22:31:38 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/chain.c,v 1.53 2006/05/06 14:15:25 ando Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 2003-2006 The OpenLDAP Foundation.
@@ -381,7 +381,7 @@ Document: draft-ietf-ldapbis-protocol-27
 	
 		/* parse reference and use 
 		 * proto://[host][:port]/ only */
-		rc = ldap_url_parse_ext( ref->bv_val, &srv );
+		rc = ldap_url_parse_ext( ref->bv_val, &srv, LDAP_PVT_URL_PARSE_NONE );
 		if ( rc != LDAP_URL_SUCCESS ) {
 			/* try next */
 			rc = LDAP_OTHER;
@@ -618,7 +618,7 @@ ldap_chain_response( Operation *op, Slap
 
 				/* parse reference and use
 				 * proto://[host][:port]/ only */
-				rc = ldap_url_parse_ext( curr[0].bv_val, &srv );
+				rc = ldap_url_parse_ext( curr[0].bv_val, &srv, LDAP_PVT_URL_PARSE_NONE );
 				if ( rc != LDAP_URL_SUCCESS ) {
 					/* try next */
 					rs->sr_err = LDAP_OTHER;
@@ -1550,6 +1550,7 @@ ldap_chain_db_init_common(
 	BackendDB	*be )
 {
 	BackendInfo	*bi = be->bd_info;
+	ldapinfo_t	*li;
 	int		t;
 
 	be->bd_info = lback;
@@ -1558,6 +1559,9 @@ ldap_chain_db_init_common(
 	if ( t != 0 ) {
 		return t;
 	}
+	li = (ldapinfo_t *)be->be_private;
+	li->li_urllist_f = NULL;
+	li->li_urllist_p = NULL;
 	be->bd_info = bi;
 
 	return 0;
@@ -1590,6 +1594,8 @@ ldap_chain_db_init_one(
 		return t;
 	}
 	li = (ldapinfo_t *)be->be_private;
+	li->li_urllist_f = NULL;
+	li->li_urllist_p = NULL;
 
 	/* copy common data */
 	li->li_nretries = lc->lc_common_li->li_nretries;