- removed char* in favour of string

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

diff --git a/contrib/ldapc++/src/LDAPAddRequest.cpp b/contrib/ldapc++/src/LDAPAddRequest.cpp
index f127d153aa233763790ce218f6bc59a1932e642c..f92e233b055e4f1712b4335ec355e47fa44201e1 100644 (file)
--- a/contrib/ldapc++/src/LDAPAddRequest.cpp
+++ b/contrib/ldapc++/src/LDAPAddRequest.cpp
@@ -12,38 +12,44 @@
 #include "LDAPEntry.h"
 #include "LDAPException.h"
 #include "LDAPMessageQueue.h"
+#include "LDAPResult.h"
 
 LDAPAddRequest::LDAPAddRequest(const LDAPAddRequest& req) :
         LDAPRequest(req){
-    DEBUG(LDAP_DEBUG_TRACE, "LDAPAddRequest::LDAPAddRequest(LDAPAddRequest&)"
-            << endl);
+    DEBUG(LDAP_DEBUG_CONSTRUCT, "LDAPAddRequest::LDAPAddRequest(&)" << endl);
+    m_entry=new LDAPEntry(*(req.m_entry));
 }
 
-LDAPAddRequest::LDAPAddRequest(const LDAPEntry *entry, 
-        const LDAPAsynConnection *connect, const LDAPConstraints *cons,
-        bool isReferral=false) 
-        : LDAPRequest(connect, cons, isReferral){
-    DEBUG(LDAP_DEBUG_TRACE, "LDAPAddRequest::LDAPAddRequest()" << endl);
-    DEBUG(LDAP_DEBUG_PARAMETER, "   entry:" << *entry << endl
+LDAPAddRequest::LDAPAddRequest(const LDAPEntry* entry, 
+        LDAPAsynConnection *connect, const LDAPConstraints *cons,
+        bool isReferral, const LDAPRequest* parent) 
+        : LDAPRequest(connect, cons, isReferral,parent){
+    DEBUG(LDAP_DEBUG_CONSTRUCT, "LDAPAddRequest::LDAPAddRequest()" << endl);
+    DEBUG(LDAP_DEBUG_CONSTRUCT | LDAP_DEBUG_PARAMETER, 
+            "   entry:" << entry << endl 
             << "   isReferral:" << isReferral << endl);
     m_requestType = LDAPRequest::ADD;
     m_entry = new LDAPEntry(*entry);
 }
 
 LDAPAddRequest::~LDAPAddRequest(){
-    DEBUG(LDAP_DEBUG_TRACE, "LDAPAddRequest::~LDAPAddRequest()" << endl);
+    DEBUG(LDAP_DEBUG_DESTROY, "LDAPAddRequest::~LDAPAddRequest()" << endl);
     delete m_entry;
 }
 
 LDAPMessageQueue* LDAPAddRequest::sendRequest(){
     DEBUG(LDAP_DEBUG_TRACE, "LDAPAddRequest::sendRequest()" << endl);
     int msgID=0;
-    LDAPAttributeList *attrList = m_entry->getAttributes();
+    const LDAPAttributeList* list=m_entry->getAttributes();
+    LDAPMod** attrs=list->toLDAPModArray();
+    LDAPControl** tmpSrvCtrls = m_cons->getSrvCtrlsArray();
+    LDAPControl** tmpClCtrls = m_cons->getClCtrlsArray();
     int err=ldap_add_ext(m_connection->getSessionHandle(),
-            m_entry->getDN(),attrList->toLDAPModArray(), 
-            m_cons->getSrvCtrlsArray(), m_cons->getClCtrlsArray(),&msgID);
+            m_entry->getDN().c_str(),attrs,tmpSrvCtrls,tmpClCtrls,&msgID);
+    ldap_controls_free(tmpSrvCtrls);
+    ldap_controls_free(tmpClCtrls);
+    ldap_mods_free(attrs,1);
     if(err != LDAP_SUCCESS){
-        delete this;
         throw LDAPException(err);
     }else{
         m_msgID=msgID;
@@ -51,9 +57,20 @@ LDAPMessageQueue* LDAPAddRequest::sendRequest(){
     }
 }
 
-LDAPRequest* LDAPAddRequest::followReferral(LDAPUrlList *urls){
+LDAPRequest* LDAPAddRequest::followReferral(LDAPMsg* ref){
     DEBUG(LDAP_DEBUG_TRACE, "LDAPAddRequest::followReferral()"<< endl);
-    cerr << "to be implemented" << endl;
+    LDAPUrlList::const_iterator usedUrl;
+    LDAPUrlList urls = ((LDAPResult*)ref)->getReferralUrls();
+    LDAPAsynConnection* con = 0;
+    try {
+        con = getConnection()->referralConnect(urls,usedUrl,m_cons);
+    } catch(LDAPException e){
+        delete con;
+        return 0;
+    }
+    if(con != 0){
+        return new LDAPAddRequest(m_entry, con, m_cons,true,this);
+    }
     return 0;
 }