remove UNSPECIFIED_TLS... HOST implies ldap://

diff --git a/include/ldap.h b/include/ldap.h
index 322785c25da9b8ebca7b8af6c4c646d2f21d4df1..f937741220f3bf0de09740275dad943751908a39 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -501,7 +501,6 @@ typedef struct ldap_url_desc {
 
 /* lud_properties */
 #define        LDAP_URL_USE_SSL                0x00000001
-#define LDAP_URL_USE_SSL_UNSPECIFIED   0x00000002
 
 /* lud_protocol */
 #define LDAP_PROTO_TCP                 0x00

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 4cb084f50673aa6f0f8d7e90ffb2ecc0859e9a99..1253a3c37f3138b834f0f2e3842b6abe0130c336 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -310,8 +310,6 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
 
 #ifdef HAVE_TLS
        tls = (srv->lud_properties & LDAP_URL_USE_SSL);
-       if (tls == 0)
-               tls = (srv->lud_properties & LDAP_URL_USE_SSL_UNSPECIFIED);
 
        if ( tls != 0 ) {
                rc = ldap_pvt_tls_start( sb, ld->ld_options.ldo_tls_ctx );

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 9d29cc41208d5a40b658f5fcd8b87918d2498db9..59b055c43057ac1c0a51a8eafdb2a550782486dc 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -592,7 +592,7 @@ ldap_url_parsehosts (LDAPURLDesc **ludlist, const char *hosts )
                }
                ldap_pvt_hex_unescape(ludp->lud_host);
                ludp->lud_protocol = LDAP_PROTO_TCP;
-               ludp->lud_properties = LDAP_URL_USE_SSL_UNSPECIFIED;
+               ludp->lud_properties = 0;
                ludp->lud_next = *ludlist;
                *ludlist = ludp;
        }