From: Howard Chu <hyc@openldap.org>
Date: Fri, 12 May 2000 10:43:20 +0000 (+0000)
Subject: Fix ldaps / TLS processing...
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2997
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7d402a5562403ab8bdb46b0df8d40a80b069660c;p=openldap

Fix ldaps / TLS processing...
  open.c: open_ldap_connection was not honoring the TLS config option.
  url.c: ldap_url_dup was not copying the properties.
---

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 7339bc3415..856d4f81c4 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -268,9 +268,6 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
 {
 	int rc = -1;
 	int port;
-#ifdef HAVE_TLS
-	int tls;
-#endif
 	long addr;
 
 	Debug( LDAP_DEBUG_TRACE, "open_ldap_connection\n", 0, 0, 0 );
@@ -306,9 +303,8 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
    	ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
 
 #ifdef HAVE_TLS
-	tls = (srv->lud_properties & LDAP_URL_USE_SSL);
-
-	if ( tls != 0 ) {
+	if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
+	    (srv->lud_properties & LDAP_URL_USE_SSL)) {
 		rc = ldap_pvt_tls_start( ld, sb, ld->ld_options.ldo_tls_ctx );
 		if (rc != LDAP_SUCCESS)
 			return rc;
diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 59b055c430..7be84de9cc 100644
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -449,10 +449,12 @@ ldap_url_dup ( LDAPURLDesc *ludp )
 		return NULL;
 	}
 
-	dest = LDAP_CALLOC( 1, sizeof(LDAPURLDesc) );
+	dest = LDAP_MALLOC( sizeof(LDAPURLDesc) );
 	if (dest == NULL)
 		return NULL;
 	
+	*dest = *ludp;
+
 	if ( ludp->lud_host != NULL ) {
 		dest->lud_host = LDAP_STRDUP( ludp->lud_host );
 		if (dest->lud_host == NULL) {
@@ -493,9 +495,6 @@ ldap_url_dup ( LDAPURLDesc *ludp )
 		}
 	}
 
-	dest->lud_port = ludp->lud_port;
-	dest->lud_scope = ludp->lud_scope;
-
 	return dest;
 }