diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-05 10:14:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-07 17:45:20 +1100 |
| commit | 36b2227eca55e769813eecc97366ba18a2832fb3 (patch) | |
| tree | e7ad966a443a67762814a256d1ef3446471b8d27 /libcli/ldap | |
| parent | ed41edddde6b81b759d4b4c8d9e59ee541a37c0a (diff) | |
| download | samba-36b2227eca55e769813eecc97366ba18a2832fb3.tar.gz samba-36b2227eca55e769813eecc97366ba18a2832fb3.tar.bz2 samba-36b2227eca55e769813eecc97366ba18a2832fb3.zip | |
ldb: use ldb directly rather than via a copy
This avoids needing to manually sync the two files, which due to the
top level build must be API compatible at all times anyway.
The most important recent change was:
commit e3b76bd6205acfc1a89fbcab5d9588b32cb47b88
Author: Andrew Tridgell <tridge@samba.org>
Date: Thu Jul 28 15:51:31 2011 +1000
ldb: fixed a search expression parse bug
However, as we always control the search expression in the callers to
this code, no backport to other releases is required.
Andrew Bartlett
Diffstat (limited to 'libcli/ldap')
| -rw-r--r-- | libcli/ldap/ldap_message.h | 4 | ||||
| -rw-r--r-- | libcli/ldap/ldap_ndr.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h index 94eaed2f96..eb7e6206b1 100644 --- a/libcli/ldap/ldap_message.h +++ b/libcli/ldap/ldap_message.h @@ -22,11 +22,7 @@ #define _LIBCLI_LDAP_MESSAGE_H_ #include "../libcli/ldap/ldap_errors.h" -#if _SAMBA_BUILD_ == 3 -#include "lib/ldb_compat.h" -#else #include <ldb.h> -#endif enum ldap_request_tag { LDAP_TAG_BindRequest = 0, diff --git a/libcli/ldap/ldap_ndr.c b/libcli/ldap/ldap_ndr.c index f77a6f2c3d..9cc502eb36 100644 --- a/libcli/ldap/ldap_ndr.c +++ b/libcli/ldap/ldap_ndr.c @@ -21,11 +21,7 @@ */ #include "includes.h" -#if _SAMBA_BUILD_ == 3 -#include "lib/ldb_compat.h" -#else #include <ldb.h> -#endif #include "librpc/gen_ndr/ndr_security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "libcli/ldap/ldap_ndr.h" |