diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-21 17:39:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-05-21 17:39:15 +1000 |
| commit | c8a23147fe12c693fd7944af7bb09b88393789d9 (patch) | |
| tree | afc5acd86471cab57ecac447a8396545396c5aab /source4/libcli/ldap | |
| parent | 82c97e0ab840d8acfc81c3096bebc8c3d3e0bde3 (diff) | |
| download | samba-c8a23147fe12c693fd7944af7bb09b88393789d9.tar.gz samba-c8a23147fe12c693fd7944af7bb09b88393789d9.tar.bz2 samba-c8a23147fe12c693fd7944af7bb09b88393789d9.zip | |
s4:libcli/ldap Rename ldap.h to libcli_ldap.h
It is a problem if a samba header is called ldap.h if we also want
to use OpenLDAP's ldap.h
Andrew Bartlett
Diffstat (limited to 'source4/libcli/ldap')
| -rw-r--r-- | source4/libcli/ldap/ldap_bind.c | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_client.c | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_client.h | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_controls.c | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_ildap.c | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/libcli_ldap.h (renamed from source4/libcli/ldap/ldap.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c index 5e6a5faafa..804c57c2b2 100644 --- a/source4/libcli/ldap/ldap_bind.c +++ b/source4/libcli/ldap/ldap_bind.c @@ -22,7 +22,7 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "libcli/ldap/ldap_proto.h" #include "libcli/ldap/ldap_client.h" #include "lib/tls/tls.h" diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index eb53276936..281266361e 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -27,7 +27,7 @@ #include "lib/socket/socket.h" #include "../lib/util/asn1.h" #include "../lib/util/dlinklist.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "libcli/ldap/ldap_proto.h" #include "libcli/ldap/ldap_client.h" #include "libcli/composite/composite.h" diff --git a/source4/libcli/ldap/ldap_client.h b/source4/libcli/ldap/ldap_client.h index 084de2e6dc..3b4da6bcf2 100644 --- a/source4/libcli/ldap/ldap_client.h +++ b/source4/libcli/ldap/ldap_client.h @@ -20,7 +20,7 @@ */ -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" enum ldap_request_state { LDAP_REQUEST_SEND=1, LDAP_REQUEST_PENDING=2, LDAP_REQUEST_DONE=3, LDAP_REQUEST_ERROR=4 }; diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c index 94b32b305b..b0c024a361 100644 --- a/source4/libcli/ldap/ldap_controls.c +++ b/source4/libcli/ldap/ldap_controls.c @@ -21,7 +21,7 @@ #include "includes.h" #include "../lib/util/asn1.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "lib/ldb/include/ldb.h" #include "libcli/ldap/ldap_proto.h" #include "dsdb/samdb/samdb.h" diff --git a/source4/libcli/ldap/ldap_ildap.c b/source4/libcli/ldap/ldap_ildap.c index f059e3882a..77bf3f0a35 100644 --- a/source4/libcli/ldap/ldap_ildap.c +++ b/source4/libcli/ldap/ldap_ildap.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "libcli/ldap/ldap_client.h" diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/libcli_ldap.h index 79cfef2128..79cfef2128 100644 --- a/source4/libcli/ldap/ldap.h +++ b/source4/libcli/ldap/libcli_ldap.h |