Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/contrib/ldapc++/src/LDAPSearchRequest.cpp b/contrib/ldapc++/src/LDAPSearchRequest.cpp
index 6115c71024c40753b1f1eaebd40eace481f51c54..28b5023554d9976293bb30145f65b1889972bd4c 100644 (file)
--- a/contrib/ldapc++/src/LDAPSearchRequest.cpp
+++ b/contrib/ldapc++/src/LDAPSearchRequest.cpp
@@ -1,8 +1,11 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2012 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
+#include "config.h"
+#include "ac/time.h"
 #include "debug.h"
 #include "LDAPSearchRequest.h"
 #include "LDAPException.h"
@@ -11,6 +14,8 @@
 #include "LDAPRequest.h"
 #include "LDAPUrl.h"
 
+using namespace std;
+
 LDAPSearchRequest::LDAPSearchRequest(const LDAPSearchRequest& req ) :
         LDAPRequest (req){
     DEBUG(LDAP_DEBUG_CONSTRUCT, 
@@ -66,9 +71,9 @@ LDAPMessageQueue* LDAPSearchRequest::sendRequest(){
             m_scope, m_filter.c_str(), tmpattrs, m_attrsOnly, tmpSrvCtrl,
             tmpClCtrl, tmptime, m_cons->getSizeLimit(), &msgID );
     delete tmptime;
-    ldap_value_free(tmpattrs);
-    ldap_controls_free(tmpSrvCtrl);
-    ldap_controls_free(tmpClCtrl);
+    ber_memvfree((void**)tmpattrs);
+    LDAPControlSet::freeLDAPControlArray(tmpSrvCtrl);
+    LDAPControlSet::freeLDAPControlArray(tmpClCtrl);
 
     if (err != LDAP_SUCCESS){  
         throw LDAPException(err);
@@ -95,7 +100,6 @@ LDAPRequest* LDAPSearchRequest::followReferral(LDAPMsg* ref){
     }
     con = getConnection()->referralConnect(urls,usedUrl,m_cons);
     if(con != 0){
-        cerr << usedUrl->getFilter();
         if((usedUrl->getFilter() != "") && 
             (usedUrl->getFilter() != m_filter)){
                 filter=usedUrl->getFilter();