r12733: Merge ldap/ldb controls into main tree

[mdw/samba.git] / source4 / libcli / ldap / ldap.h

diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index b6e69ff8e6926a3c3661543cff13ef4280bc7eaf..5283553f13e3adacaa57f69f30b2517e5ae9adb2 100644 (file)
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -243,15 +243,14 @@ union ldap_Request {
 struct ldap_Control {
        const char *oid;
        BOOL        critical;
-       DATA_BLOB   value;
+       void       *value;
 };
 
 struct ldap_message {
-       uint32_t                messageid;
+       int                     messageid;
        enum ldap_request_tag   type;
        union ldap_Request      r;
-       int                     num_controls;
-       struct ldap_Control    *controls;
+       struct ldap_Control    **controls;
 };
 
 #include "libcli/ldap/ldap_proto.h"