X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Furl.c;h=6098bb8910cbaa2b088dc29abb19e317c8628bd2;hb=c23536faa9bebfed42ee17b693f780e160a801ad;hp=59b055c43057ac1c0a51a8eafdb2a550782486dc;hpb=9ac0eab126e274ff9979930c08dca096669f28e5;p=openldap

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 59b055c430..6098bb8910 100644
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -274,6 +274,36 @@ ldap_url_parse( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
 		return LDAP_URL_ERR_MEM;
 	}
 
+	/*
+	 * Kluge.  ldap://111.222.333.444:389??cn=abc,o=company
+	 *
+	 * On early Novell releases, search references/referrals were returned
+	 * in this format, i.e., the dn was kind of in the scope position,
+	 * but the required slash is missing. The whole thing is illegal syntax,
+	 * but we need to account for it. Fortunately it can't be confused with
+	 * anything real.
+	 */
+	if( (p == NULL) && ((q = strchr( q, '?')) != NULL)) {
+		q++;		
+		/* ? immediately followed by question */
+		if( *q == '?') {
+			q++;
+			if( *q != '\0' ) {
+				/* parse dn part */
+				ldap_pvt_hex_unescape( q );
+				ludp->lud_dn = LDAP_STRDUP( q );
+			} else {
+				ludp->lud_dn = LDAP_STRDUP( "" );
+			}
+
+			if( ludp->lud_dn == NULL ) {
+				LDAP_FREE( url );
+				ldap_free_urldesc( ludp );
+				return LDAP_URL_ERR_MEM;
+			}
+		}
+	}
+
 	if( p == NULL ) {
 		LDAP_FREE( url );
 		*ludpp = ludp;
@@ -449,10 +479,13 @@ ldap_url_dup ( LDAPURLDesc *ludp )
 		return NULL;
 	}
 
-	dest = LDAP_CALLOC( 1, sizeof(LDAPURLDesc) );
+	dest = LDAP_MALLOC( sizeof(LDAPURLDesc) );
 	if (dest == NULL)
 		return NULL;
 	
+	*dest = *ludp;
+	dest->lud_next = NULL;
+
 	if ( ludp->lud_host != NULL ) {
 		dest->lud_host = LDAP_STRDUP( ludp->lud_host );
 		if (dest->lud_host == NULL) {
@@ -493,9 +526,6 @@ ldap_url_dup ( LDAPURLDesc *ludp )
 		}
 	}
 
-	dest->lud_port = ludp->lud_port;
-	dest->lud_scope = ludp->lud_scope;
-
 	return dest;
 }
 
@@ -721,6 +751,7 @@ ldap_url_search( LDAP *ld, LDAP_CONST char *url, int attrsonly )
 	int		err;
 	LDAPURLDesc	*ludp;
 	BerElement	*ber;
+	LDAPreqinfo  bind;
 
 	if ( ldap_url_parse( url, &ludp ) != 0 ) {
 		ld->ld_errno = LDAP_PARAM_ERROR;
@@ -734,11 +765,14 @@ ldap_url_search( LDAP *ld, LDAP_CONST char *url, int attrsonly )
 	if ( ber == NULL ) {
 		err = -1;
 	} else {
+		bind.ri_request = LDAP_REQ_SEARCH;
+		bind.ri_msgid = ld->ld_msgid;
+		bind.ri_url = (char *)url;
 		err = ldap_send_server_request(
 					ld, ber, ld->ld_msgid, NULL,
 					(ludp->lud_host != NULL || ludp->lud_port != 0)
 						? ludp : NULL,
-					NULL, 1 );
+					NULL, &bind );
 	}
 
 	ldap_free_urldesc( ludp );