diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-01-24 13:29:14 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-01-24 14:55:50 +0100 |
commit | 0dc1eee0b8174d591ea02de40bb564088a25fd97 (patch) | |
tree | f5ed8238ec81fa3993227b0795e8d6c8577ebffd | |
parent | cea36aeacf8778493463f31e6afc3f58384639e2 (diff) | |
download | samba-0dc1eee0b8174d591ea02de40bb564088a25fd97.tar.gz samba-0dc1eee0b8174d591ea02de40bb564088a25fd97.tar.bz2 samba-0dc1eee0b8174d591ea02de40bb564088a25fd97.zip |
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
-rw-r--r-- | libcli/ldap/ldap_message.h | 4 | ||||
-rw-r--r-- | source3/lib/ldb_compat.h | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h index c50018465c..3354fadb92 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 fb8f2f0377..f05104a5c6 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 |