Merge branch 'mdb.master' of /home/hyc/OD/mdb

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

diff --git a/contrib/ldapc++/src/LDAPMessage.cpp b/contrib/ldapc++/src/LDAPMessage.cpp
index 05aede6f6ea8ffb11d652f7bb02b0f291ea79a61..881f8a11535a75d77607afaa759889d613d6fea7 100644 (file)
--- a/contrib/ldapc++/src/LDAPMessage.cpp
+++ b/contrib/ldapc++/src/LDAPMessage.cpp
@@ -1,5 +1,6 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -8,45 +9,57 @@
 
 #include "LDAPResult.h"
 #include "LDAPExtResult.h"
+#include "LDAPSaslBindResult.h"
 #include "LDAPRequest.h"
 #include "LDAPSearchResult.h"
 #include "LDAPSearchReference.h"
 #include "debug.h"
 #include <iostream>
 
+using namespace std;
+
 LDAPMsg::LDAPMsg(LDAPMessage *msg){
     DEBUG(LDAP_DEBUG_CONSTRUCT,"LDAPMsg::LDAPMsg()" << endl);
-       msgType=ldap_msgtype(msg);
+    msgType=ldap_msgtype(msg);
+    m_hasControls=false;
+}
+
+LDAPMsg::LDAPMsg(int type, int id=0){
+    DEBUG(LDAP_DEBUG_CONSTRUCT,"LDAPMsg::LDAPMsg()" << endl);
+    msgType = type;
+    msgID = id;
     m_hasControls=false;
 }
 
 LDAPMsg* LDAPMsg::create(const LDAPRequest *req, LDAPMessage *msg){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPMsg::create()" << endl);
-       switch(ldap_msgtype(msg)){
-               case SEARCH_ENTRY :
-                       return new LDAPSearchResult(req,msg);
-               break;
-               case SEARCH_REFERENCE :
-                       return new LDAPSearchReference(req, msg);
-               break;
+    switch(ldap_msgtype(msg)){
+        case SEARCH_ENTRY :
+            return new LDAPSearchResult(req,msg);
+        break;
+        case SEARCH_REFERENCE :
+            return new LDAPSearchReference(req, msg);
+        break;
         case EXTENDED_RESPONSE :
             return new LDAPExtResult(req,msg);
         break;
-               default :
-                       return new LDAPResult(req, msg);
-       }
-       return 0;
+        case BIND_RESPONSE :
+            return new LDAPSaslBindResult(req,msg);
+        default :
+            return new LDAPResult(req, msg);
+    }
+    return 0;
 }
 
 
 int LDAPMsg::getMessageType(){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPMsg::getMessageType()" << endl);
-       return msgType;
+    return msgType;
 }
 
 int LDAPMsg::getMsgID(){
     DEBUG(LDAP_DEBUG_TRACE,"LDAPMsg::getMsgID()" << endl);
-       return msgID;
+    return msgID;
 }
 
 bool LDAPMsg::hasControls() const{