libcli/ldap: use lib/ldb_compat.h for the s3 build
authorStefan Metzmacher <metze@samba.org>
Mon, 24 Jan 2011 12:29:14 +0000 (13:29 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 24 Jan 2011 13:55:50 +0000 (14:55 +0100)
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jan 24 14:55:50 CET 2011 on sn-devel-104

libcli/ldap/ldap_message.h
source3/lib/ldb_compat.h

index c500184..3354fad 100644 (file)
 #define _LIBCLI_LDAP_MESSAGE_H_
 
 #include "../libcli/ldap/ldap_errors.h"
+#if _SAMBA_BUILD_ == 3
+#include "lib/ldb_compat.h"
+#else
 #include "lib/ldb/include/ldb.h"
+#endif
 
 enum ldap_request_tag {
        LDAP_TAG_BindRequest = 0,
index fb8f2f0..f05104a 100644 (file)
@@ -71,4 +71,17 @@ struct ldb_parse_tree {
        } u;
 };
 
+struct ldb_message_element {
+       unsigned int flags;
+       const char *name;
+       unsigned int num_values;
+       struct ldb_val *values;
+};
+
+struct ldb_control {
+       const char *oid;
+       int critical;
+       void *data;
+};
+
 #endif