Merge remote branch 'origin/mdb.master'

[openldap] / contrib / ldapc++ / src / TlsOptions.cpp

diff --git a/contrib/ldapc++/src/TlsOptions.cpp b/contrib/ldapc++/src/TlsOptions.cpp
index 05e2a90882330382961ec635bf2ae0825764b55e..5d936e9400fd5b87a67b3205ca0bb6f8a0e130d8 100644 (file)
--- a/contrib/ldapc++/src/TlsOptions.cpp
+++ b/contrib/ldapc++/src/TlsOptions.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2012 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -48,6 +48,8 @@ static void checkOpt( TlsOptions::tls_option opt, opttype type ) {
     }
 }
 
+TlsOptions::TlsOptions() : m_ld(NULL) {}
+
 TlsOptions::TlsOptions( LDAP* ld ): m_ld(ld) { }
 
 void TlsOptions::setOption( tls_option opt, const std::string& value ) const {
@@ -70,9 +72,7 @@ void TlsOptions::setOption( tls_option opt, void *value ) const {
             throw( LDAPException( LDAP_PARAM_ERROR, "error while setting TLS option" ) );
         }
     }
-    if ( m_ld ){
-        this->newCtx();
-    }
+    this->newCtx();
 }
 
 void TlsOptions::getOption( tls_option opt, void* value ) const {
@@ -108,7 +108,8 @@ std::string TlsOptions::getStringOption( tls_option opt ) const {
 }
 
 void TlsOptions::newCtx() const {
-    int ret = ldap_set_option( m_ld, LDAP_OPT_X_TLS_NEWCTX, LDAP_OPT_ON);
+    int val = 0;
+    int ret = ldap_set_option( m_ld, LDAP_OPT_X_TLS_NEWCTX, &val);
     if ( ret != LDAP_OPT_SUCCESS )
     {
         if ( ret != LDAP_OPT_ERROR ){