ITS#843: Don't use hostport from url

diff --git a/CHANGES b/CHANGES
index 416cc7bc8fe0580871366895ed0195238804ec69..981f00832d8626aea2af23aa7acd52150d2ce365 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,9 +3,10 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.X Engineering
        Fixed -lldap TLS data ready bug (ITS#821)
        Fixed -lldap abandon unsent op bug (ITS#837)
+       Fixed -lldap URL search w/o host bug (ITS#843)
        Fixed slapd spasswd mutex bug
        Fixed slapd ACL nameuid bug
-       Fixed slapd SASL layerring bug
+       Fixed slapd SASL layering bug
        Fixed slapd unknown authc method bug (ITS#831)
        Updated -lldap SASL error reporting
        Updated -lldap TLS error reporting

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index dc188bf813c4e856bf0e1d3d03657e2c984df54e..652048a31e9f6225dc80b2fd46af308e88639115 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -153,8 +153,7 @@ skip_url_prefix(
        }
 
        /* skip leading "URL:" (if any) */
-       if ( strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0 )
-       {
+       if ( strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0 ) {
                p += LDAP_URL_URLCOLON_LEN;
        }
 
@@ -895,9 +894,7 @@ ldap_url_search( LDAP *ld, LDAP_CONST char *url, int attrsonly )
                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, &bind );
+                                       NULL, NULL, &bind );
        }
 
        ldap_free_urldesc( ludp );