From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 5 Jul 2017 20:14:54 +0000 (-0700)
Subject: ITS#8583 - Fix C++ LDAP Control structure
X-Git-Tag: OPENLDAP_REL_ENG_2_4_46~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b70535007ee1121597a860f0b1aa3755551c0ee;p=thirdparty%2Fopenldap.git

ITS#8583 - Fix C++ LDAP Control structure
---

diff --git a/contrib/ldapc++/src/LDAPControl.cpp b/contrib/ldapc++/src/LDAPControl.cpp
index e965a3f1a2..bae3167cfb 100644
--- a/contrib/ldapc++/src/LDAPControl.cpp
+++ b/contrib/ldapc++/src/LDAPControl.cpp
@@ -39,8 +39,9 @@ LDAPCtrl::LDAPCtrl(const string& oid, bool critical, const string& data){
 LDAPCtrl::LDAPCtrl(const LDAPControl* ctrl){
     DEBUG(LDAP_DEBUG_CONSTRUCT,"LDAPCtrl::LDAPCtrl()" << endl);
     m_oid = string(ctrl->ldctl_oid);
-    m_oid = ctrl->ldctl_iscritical ? true : false;
-    m_oid = string(ctrl->ldctl_value.bv_val, ctrl->ldctl_value.bv_len );
+    m_isCritical = ctrl->ldctl_iscritical ? true : false;
+    m_data = string(ctrl->ldctl_value.bv_val, ctrl->ldctl_value.bv_len );
+    m_noData = ctrl->ldctl_value.bv_len ? false : true;
 }
 
 LDAPCtrl::~LDAPCtrl(){