From 9ac0eab126e274ff9979930c08dca096669f28e5 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 14 Jan 2000 01:08:15 +0000 Subject: [PATCH] remove UNSPECIFIED_TLS... HOST implies ldap:// --- include/ldap.h | 1 - libraries/libldap/open.c | 2 -- libraries/libldap/url.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/ldap.h b/include/ldap.h index 322785c25d..f937741220 100644 --- 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 4cb084f506..1253a3c37f 100644 --- 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 9d29cc4120..59b055c430 100644 --- 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; } -- 2.39.5