Commit 05c9d4bf authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Fix TLS ldap.conf issues

parent 0ec312d3
......@@ -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;
}
......
......@@ -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;
......
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