From 0dc1eee0b8174d591ea02de40bb564088a25fd97 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 24 Jan 2011 13:29:14 +0100 Subject: [PATCH] libcli/ldap: use lib/ldb_compat.h for the s3 build metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Mon Jan 24 14:55:50 CET 2011 on sn-devel-104 --- libcli/ldap/ldap_message.h | 4 ++++ source3/lib/ldb_compat.h | 13 +++++++++++++ 2 files changed, 17 insertions(+) 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 -- 2.34.1