Use experimental OIDs for saslAuth attributes and hide 'em

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

diff --git a/contrib/ldapc++/src/LDAPConnection.cpp b/contrib/ldapc++/src/LDAPConnection.cpp
index 7baa9333a77162f02809b36adfd23f111824e4d1..71165ea8529232f0a8619952cd2db75bfb226511 100644 (file)
--- a/contrib/ldapc++/src/LDAPConnection.cpp
+++ b/contrib/ldapc++/src/LDAPConnection.cpp
@@ -15,6 +15,8 @@ const int LDAPConnection::SEARCH_BASE = LDAPAsynConnection::SEARCH_BASE;
 const int LDAPConnection::SEARCH_ONE = LDAPAsynConnection::SEARCH_ONE;
 const int LDAPConnection::SEARCH_SUB = LDAPAsynConnection::SEARCH_SUB;
 
+using namespace std;
+
 LDAPConnection::LDAPConnection(const string& hostname, int port, 
         LDAPConstraints* cons) :
         LDAPAsynConnection(hostname, port, cons){
@@ -22,6 +24,10 @@ LDAPConnection::LDAPConnection(const string& hostname, int port,
 
 LDAPConnection::~LDAPConnection(){
 }
+
+int LDAPConnection::start_tls(){
+    return LDAPAsynConnection::start_tls();
+}
    
 void LDAPConnection::bind(const string& dn, const string& passwd,
         LDAPConstraints* cons){
@@ -50,6 +56,7 @@ void LDAPConnection::bind(const string& dn, const string& passwd,
         }
     }
     delete res;
+    delete msg;   // memcheck
 }
 
 void LDAPConnection::unbind(){
@@ -130,7 +137,7 @@ void LDAPConnection::del(const string& dn, const LDAPConstraints* cons){
 
 }
 
-void LDAPConnection::add(const LDAPEntry* le, const LDAPConstraints* cons=0){
+void LDAPConnection::add(const LDAPEntry* le, const LDAPConstraints* cons){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPConnection::add" << endl);
     LDAPMessageQueue* msg=0;
     LDAPResult* res=0;
@@ -200,7 +207,7 @@ void LDAPConnection::modify(const string& dn, const LDAPModList* mods,
 
 void LDAPConnection::rename(const string& dn, const string& newRDN,
         bool delOldRDN, const string& newParentDN, 
-        const LDAPConstraints* cons=0){
+        const LDAPConstraints* cons){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPConnection::rename" << endl);
     LDAPMessageQueue* msg=0;
     LDAPResult* res=0;
@@ -243,11 +250,12 @@ LDAPSearchResults* LDAPConnection::search(const string& base, int scope,
     LDAPSearchResults* results= 0;
     
     try{
+        results = new LDAPSearchResults();
         msgq = LDAPAsynConnection::search(base,scope, filter, attrs, attrsOnly,
                 cons);
-        results = new LDAPSearchResults();
         res = results->readMessageQueue(msgq);
     }catch(LDAPException e){
+        delete results; // memcheck
         delete msgq;
         throw;
     }
@@ -262,12 +270,14 @@ LDAPSearchResults* LDAPConnection::search(const string& base, int scope,
             case LDAPResult::REFERRAL :
             {
                 LDAPUrlList urls = res->getReferralUrls();
+                delete results; // memcheck
                 delete res;
                 delete msgq;
                 throw LDAPReferralException(urls);
             }
             break;
             default :
+                delete results; // memcheck
                 delete res;
                 delete msgq;
                 throw LDAPException(resCode);
@@ -277,7 +287,7 @@ LDAPSearchResults* LDAPConnection::search(const string& base, int scope,
 }
 
 LDAPExtResult* LDAPConnection::extOperation(const string& oid, 
-        const string& value, const LDAPConstraints *cons = 0){
+        const string& value, const LDAPConstraints *cons){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPConnection::extOperation" << endl);
     LDAPMessageQueue* msg=0;
     LDAPExtResult* res=0;
@@ -324,3 +334,26 @@ void LDAPConnection::setConstraints(LDAPConstraints* cons){
 const LDAPConstraints* LDAPConnection::getConstraints() const{
     return LDAPAsynConnection::getConstraints();
 }
+
+int LDAPConnection::enableCache(long timeout, long maxmem) {
+    return LDAPAsynConnection::enableCache(timeout, maxmem);
+}
+
+
+void LDAPConnection::disableCache() {
+    LDAPAsynConnection::disableCache();
+}
+
+bool LDAPConnection::getCacheEnabled() { 
+    return LDAPAsynConnection::getCacheEnabled();
+}
+
+void LDAPConnection::uncache_entry(string &dn) {
+    LDAPAsynConnection::uncache_entry(dn);
+}
+
+void LDAPConnection::flush_cache()
+{
+    LDAPAsynConnection::flush_cache();
+}
+