Import TLS init fix from HEAD

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 85c9ded5bcd9407fada98cb8ded1d4be6cd6aef6..25cd6a860566fd5385e257cc1a78815a2e760063 100644 (file)
--- 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 90a11429d8789e4ba930f52d503c1ae2ddf5abd8..653caa3ee88578b974932e901d3e905b7af3d768 100644 (file)
--- 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;