The branch, master has been updated via 0dc1eee libcli/ldap: use lib/ldb_compat.h for the s3 build from cea36ae s3-winbind: fix winbindd_dual_pam_auth_samlogon() for NT4 domains.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0dc1eee0b8174d591ea02de40bb564088a25fd97 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jan 24 13:29:14 2011 +0100 libcli/ldap: use lib/ldb_compat.h for the s3 build metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Mon Jan 24 14:55:50 CET 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: libcli/ldap/ldap_message.h | 4 ++++ source3/lib/ldb_compat.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h index c500184..3354fad 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 fb8f2f0..f05104a 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 -- Samba Shared Repository