Merge remote branch 'origin/mdb.master'

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

diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.cpp b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
index 0cc34e6ac1becdc7a4a958c7052f2eda494b46af..23d2e2242635dc916babe2276133845dae4d7aac 100644 (file)
--- a/contrib/ldapc++/src/LDAPDeleteRequest.cpp
+++ b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
@@ -1,5 +1,6 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2012 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,6 +13,8 @@
 #include "LDAPMessageQueue.h"
 #include "LDAPResult.h"
 
+using namespace std;
+
 LDAPDeleteRequest::LDAPDeleteRequest( const LDAPDeleteRequest& req) :
         LDAPRequest(req){
        DEBUG(LDAP_DEBUG_CONSTRUCT, 
@@ -31,8 +34,8 @@ LDAPDeleteRequest::LDAPDeleteRequest(const string& dn,
 }
 
 LDAPDeleteRequest::~LDAPDeleteRequest(){
-       DEBUG(LDAP_DEBUG_DESTROY,
-            "LDAPDeleteRequest::~LDAPDeleteRequest()" << endl);
+    DEBUG(LDAP_DEBUG_DESTROY,
+          "LDAPDeleteRequest::~LDAPDeleteRequest()" << endl);
 }
 
 LDAPMessageQueue* LDAPDeleteRequest::sendRequest(){
@@ -42,8 +45,8 @@ LDAPMessageQueue* LDAPDeleteRequest::sendRequest(){
     LDAPControl** tmpClCtrls=m_cons->getClCtrlsArray();
     int err=ldap_delete_ext(m_connection->getSessionHandle(),m_dn.c_str(), 
             tmpSrvCtrls, tmpClCtrls ,&msgID);
-    ldap_controls_free(tmpSrvCtrls);
-    ldap_controls_free(tmpClCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpSrvCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpClCtrls);
     if(err != LDAP_SUCCESS){
         throw LDAPException(err);
     }else{