From 101f39da85acb0ec0aca85e97e8c9922e656a8e4 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 7 Sep 2001 23:17:03 +0000 Subject: [PATCH] Import TLS init fix from HEAD --- libraries/libldap/init.c | 4 ++-- libraries/libldap/tls.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 85c9ded5bc..25cd6a8605 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -221,7 +221,7 @@ static void openldap_ldap_init_w_conf( break; case ATTR_TLS: #ifdef HAVE_TLS - ldap_int_tls_config( gopts, attrs[i].offset, opt ); + ldap_int_tls_config( NULL, attrs[i].offset, opt ); #endif break; } @@ -357,7 +357,7 @@ static void openldap_ldap_init_w_env( break; case ATTR_TLS: #ifdef HAVE_TLS - ldap_int_tls_config( gopts, attrs[i].offset, value ); + ldap_int_tls_config( NULL, attrs[i].offset, value ); #endif break; } diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c index 90a11429d8..653caa3ee8 100644 --- a/libraries/libldap/tls.c +++ b/libraries/libldap/tls.c @@ -866,13 +866,13 @@ ldap_int_tls_config( LDAP *ld, int option, const char *arg ) case LDAP_OPT_X_TLS_CERTFILE: case LDAP_OPT_X_TLS_KEYFILE: case LDAP_OPT_X_TLS_RANDOM_FILE: - return ldap_pvt_tls_set_option( NULL, option, (void *) arg ); + return ldap_pvt_tls_set_option( ld, option, (void *) arg ); case LDAP_OPT_X_TLS_REQUIRE_CERT: i = ( ( strcasecmp( arg, "on" ) == 0 ) || ( strcasecmp( arg, "yes" ) == 0) || ( strcasecmp( arg, "true" ) == 0 ) ); - return ldap_pvt_tls_set_option( NULL, option, (void *) &i ); + return ldap_pvt_tls_set_option( ld, option, (void *) &i ); case LDAP_OPT_X_TLS: i = -1; -- 2.47.2