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/cldap_server | |
| 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/cldap_server')
| -rw-r--r-- | source4/cldap_server/cldap_server.c | 1 | ||||
| -rw-r--r-- | source4/cldap_server/cldap_server.h | 1 | ||||
| -rw-r--r-- | source4/cldap_server/rootdse.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index da59e0ccec..8bed38b557 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -21,7 +21,6 @@ #include "includes.h" #include <talloc.h> -#include "libcli/ldap/ldap.h" #include "lib/messaging/irpc.h" #include "smbd/service_task.h" #include "smbd/service.h" diff --git a/source4/cldap_server/cldap_server.h b/source4/cldap_server/cldap_server.h index e40a1bd4ba..fe7788f773 100644 --- a/source4/cldap_server/cldap_server.h +++ b/source4/cldap_server/cldap_server.h @@ -20,6 +20,7 @@ */ #include "libcli/cldap/cldap.h" +#include "libcli/ldap/libcli_ldap.h" /* top level context structure for the cldap server diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c index 7e867deff2..3592ffae72 100644 --- a/source4/cldap_server/rootdse.c +++ b/source4/cldap_server/rootdse.c @@ -21,7 +21,6 @@ #include "includes.h" #include <tevent.h> -#include "libcli/ldap/ldap.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "smbd/service_task.h" |