From c8a23147fe12c693fd7944af7bb09b88393789d9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 May 2010 17:39:15 +1000 Subject: 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 --- source4/cldap_server/cldap_server.c | 1 - source4/cldap_server/cldap_server.h | 1 + source4/cldap_server/rootdse.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/cldap_server') 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 -#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 -#include "libcli/ldap/ldap.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "smbd/service_task.h" -- cgit