From b0cf52aa2dba01ab263b630e5b93535965af7e2b Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 17 Oct 2000 21:49:32 +0000 Subject: [PATCH] ITS#843: Don't use hostport from url --- CHANGES | 3 ++- libraries/libldap/url.c | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 416cc7bc8f..981f00832d 100644 --- 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 dc188bf813..652048a31e 100644 --- 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 ); -- 2.47.2