From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 24 Jan 2011 12:29:14 +0000 (+0100)
Subject: libcli/ldap: use lib/ldb_compat.h for the s3 build
X-Git-Tag: tevent-0.9.11~1271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dc1eee0b8174d591ea02de40bb564088a25fd97;p=thirdparty%2Fsamba.git

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 c50018465c8..3354fadb92b 100644
--- 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 fb8f2f03776..f05104a5c66 100644
--- 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