#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "lutil_ldap.h"
#include "config.h"
-#ifdef HAVE_TLS
-#include <openssl/ssl.h>
-#endif
-
#define ARGS_STEP 512
/*
{ BER_BVC("saslmech="), offsetof(slap_bindconf, sb_saslmech), 'b', 0, NULL },
{ BER_BVC("secprops="), offsetof(slap_bindconf, sb_secprops), 's', 0, NULL },
{ BER_BVC("realm="), offsetof(slap_bindconf, sb_realm), 'b', 0, NULL },
- { BER_BVC("authcID="), offsetof(slap_bindconf, sb_authcId), 'b', 0, (slap_verbmasks *)authzNormalize },
+ { BER_BVC("authcID="), offsetof(slap_bindconf, sb_authcId), 'b', 1, NULL },
{ BER_BVC("authzID="), offsetof(slap_bindconf, sb_authzId), 'b', 1, (slap_verbmasks *)authzNormalize },
#ifdef HAVE_TLS
{ BER_BVC("starttls="), offsetof(slap_bindconf, sb_tls), 'i', 0, tlskey },
BER_BVZERO( &bc->sb_authzId );
}
#ifdef HAVE_TLS
-#if 0
- if ( bc->sb_tls_ctx ) {
- SSL_CTX_free( bc->sb_tls_ctx );
- bc->sb_tls_ctx = NULL;
- }
-#endif
if ( bc->sb_tls_cert ) {
ch_free( bc->sb_tls_cert );
bc->sb_tls_cert = NULL;
int opt = 0;
if ( bc->sb_tls_ctx ) {
- SSL_CTX_free( bc->sb_tls_ctx );
+ ldap_pvt_tls_ctx_free( bc->sb_tls_ctx );
bc->sb_tls_ctx = NULL;
}
rc = ldap_set_option( ld, LDAP_OPT_X_TLS_NEWCTX, &opt );