libcli/ldap: use lib/ldb_compat.h for the s3 build

metze

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

diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h
index c50018465c88d83c30fbcd28d1336338e1bd2f9a..3354fadb92b086de329a5ac9da5ce56e751139b8 100644 (file)
--- a/libcli/ldap/ldap_message.h
+++ b/libcli/ldap/ldap_message.h
@@ -22,7 +22,11 @@
 #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,

diff --git a/source3/lib/ldb_compat.h b/source3/lib/ldb_compat.h
index fb8f2f03776ce91cffefc51b5dfe8915007b887c..f05104a5c66a2ce12bec568fd534c824908b20bc 100644 (file)
--- a/source3/lib/ldb_compat.h
+++ b/source3/lib/ldb_compat.h
@@ -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