Commit 9ac0eab1 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

remove UNSPECIFIED_TLS... HOST implies ldap://

parent 9c4c8e8c
......@@ -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
......
......@@ -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 );
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment