mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ldaps / TLS processing...

Browse Source 
open.c: open_ldap_connection was not honoring the TLS config option.
  url.c: ldap_url_dup was not copying the properties.
This commit is contained in:
Howard Chu 2000-05-12 10:43:20 +00:00
parent 36eddf715a
commit 7d402a5562
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/libldap/open.c
View File

@ -268,9 +268,6 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
{ {
int rc = -1; int rc = -1;
int port; int port;
#ifdef HAVE_TLS
int tls;
#endif
long addr; long addr;
Debug( LDAP_DEBUG_TRACE, "open_ldap_connection\n", 0, 0, 0 ); 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 ); ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
#ifdef HAVE_TLS #ifdef HAVE_TLS
tls = (srv->lud_properties & LDAP_URL_USE_SSL); if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
(srv->lud_properties & LDAP_URL_USE_SSL)) {
if ( tls != 0 ) {
rc = ldap_pvt_tls_start( ld, sb, ld->ld_options.ldo_tls_ctx ); rc = ldap_pvt_tls_start( ld, sb, ld->ld_options.ldo_tls_ctx );
if (rc != LDAP_SUCCESS) if (rc != LDAP_SUCCESS)
return rc; return rc;

7
libraries/libldap/url.c
View File

@ -449,10 +449,12 @@ ldap_url_dup ( LDAPURLDesc *ludp )
return NULL; return NULL;
} }
dest = LDAP_CALLOC( 1, sizeof(LDAPURLDesc) ); dest = LDAP_MALLOC( sizeof(LDAPURLDesc) );
if (dest == NULL) if (dest == NULL)
return NULL; return NULL;
*dest = *ludp;
if ( ludp->lud_host != NULL ) { if ( ludp->lud_host != NULL ) {
dest->lud_host = LDAP_STRDUP( ludp->lud_host ); dest->lud_host = LDAP_STRDUP( ludp->lud_host );
if (dest->lud_host == NULL) { 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; return dest;
} }