Entry rwlock is no longer needed as concurrency is managed

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

diff --git a/contrib/ldapc++/src/LDAPExtRequest.cpp b/contrib/ldapc++/src/LDAPExtRequest.cpp
index 5aeb4b8bd7a9ec7b25dff352ad272e7d00823b17..b7f54eeecd3b6899bb1347c2cbd3b4edd4396961 100644 (file)
--- a/contrib/ldapc++/src/LDAPExtRequest.cpp
+++ b/contrib/ldapc++/src/LDAPExtRequest.cpp
@@ -12,6 +12,8 @@
 #include "LDAPException.h"
 #include "LDAPResult.h"
 
+using namespace std;
+
 LDAPExtRequest::LDAPExtRequest(const LDAPExtRequest& req) :
         LDAPRequest(req){
     DEBUG(LDAP_DEBUG_CONSTRUCT,"LDAPExtRequest::LDAPExtRequest(&)" << endl);
@@ -39,17 +41,17 @@ LDAPMessageQueue* LDAPExtRequest::sendRequest(){
     int msgID=0;
     BerValue* tmpdata=0;
     if(m_data != ""){
-        tmpdata=new BerValue;
+        tmpdata=(BerValue*) malloc(sizeof(BerValue));
         tmpdata->bv_len = m_data.size();
-        tmpdata->bv_val = new char[m_data.size()];
+        tmpdata->bv_val = (char*) malloc(sizeof(char) * (m_data.size()) );
         m_data.copy(tmpdata->bv_val, string::npos);
     }
     LDAPControl** tmpSrvCtrls=m_cons->getSrvCtrlsArray();
     LDAPControl** tmpClCtrls=m_cons->getClCtrlsArray();
     int err=ldap_extended_operation(m_connection->getSessionHandle(),
             m_oid.c_str(), tmpdata, tmpSrvCtrls, tmpClCtrls, &msgID);
-    ldap_controls_free(tmpSrvCtrls);
-    ldap_controls_free(tmpClCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpSrvCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpClCtrls);
     ber_bvfree(tmpdata);
     if(err != LDAP_SUCCESS){
         delete this;