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 - source4/dsdb/samdb/ldb_modules/local_password.c | 1 - source4/ldap_server/ldap_backend.c | 1 - source4/ldap_server/ldap_bind.c | 1 - source4/ldap_server/ldap_extended.c | 1 - source4/ldap_server/ldap_server.c | 1 - source4/ldap_server/ldap_server.h | 2 +- source4/lib/ldb/ldb_ildap/ldb_ildap.c | 2 +- source4/libcli/ldap/ldap.h | 31 ------------------------- source4/libcli/ldap/ldap_bind.c | 2 +- source4/libcli/ldap/ldap_client.c | 2 +- source4/libcli/ldap/ldap_client.h | 2 +- source4/libcli/ldap/ldap_controls.c | 2 +- source4/libcli/ldap/ldap_ildap.c | 2 +- source4/libcli/ldap/libcli_ldap.h | 31 +++++++++++++++++++++++++ source4/torture/ldap/cldap.c | 2 +- 18 files changed, 40 insertions(+), 46 deletions(-) delete mode 100644 source4/libcli/ldap/ldap.h create mode 100644 source4/libcli/ldap/libcli_ldap.h 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" diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c b/source4/dsdb/samdb/ldb_modules/local_password.c index aa4d3af9e2..4f9cfd63d4 100644 --- a/source4/dsdb/samdb/ldb_modules/local_password.c +++ b/source4/dsdb/samdb/ldb_modules/local_password.c @@ -30,7 +30,6 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" #include "ldb_module.h" #include "dsdb/samdb/samdb.h" #include "librpc/ndr/libndr.h" diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index e6f6c66bcb..d9f15b8c80 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -21,7 +21,6 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "../lib/util/dlinklist.h" -#include "libcli/ldap/ldap.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "param/param.h" diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c index 9abc6115e6..1b235f2a1b 100644 --- a/source4/ldap_server/ldap_bind.c +++ b/source4/ldap_server/ldap_bind.c @@ -20,7 +20,6 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "auth/auth.h" -#include "libcli/ldap/ldap.h" #include "smbd/service.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c index ac8f6c1496..78fd43caac 100644 --- a/source4/ldap_server/ldap_extended.c +++ b/source4/ldap_server/ldap_extended.c @@ -20,7 +20,6 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "../lib/util/dlinklist.h" -#include "libcli/ldap/ldap.h" #include "lib/tls/tls.h" #include "smbd/service_stream.h" diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 92c549ecd2..00698eec46 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -37,7 +37,6 @@ #include "lib/messaging/irpc.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "libcli/ldap/ldap.h" #include "libcli/ldap/ldap_proto.h" #include "system/network.h" #include "lib/socket/netif.h" diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h index efa802d173..8b45285463 100644 --- a/source4/ldap_server/ldap_server.h +++ b/source4/ldap_server/ldap_server.h @@ -18,7 +18,7 @@ along with this program. If not, see . */ -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "lib/socket/socket.h" #include "lib/stream/packet.h" diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 9f81c4e534..dc1d987d76 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -44,7 +44,7 @@ #include "ldb_module.h" #include "dlinklist.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "libcli/ldap/ldap_client.h" #include "auth/auth.h" #include "auth/credentials/credentials.h" diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h deleted file mode 100644 index 79cfef2128..0000000000 --- a/source4/libcli/ldap/ldap.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Unix SMB/CIFS Implementation. - LDAP protocol helper functions for SAMBA - Copyright (C) Volker Lendecke 2004 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -*/ - -#ifndef _SMB_LDAP_H_ -#define _SMB_LDAP_H_ - -#include "../libcli/ldap/ldap_message.h" -#include "librpc/gen_ndr/misc.h" - -struct tevent_context; -struct cli_credentials; -struct dom_sid; - -#endif 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/libcli_ldap.h b/source4/libcli/ldap/libcli_ldap.h new file mode 100644 index 0000000000..79cfef2128 --- /dev/null +++ b/source4/libcli/ldap/libcli_ldap.h @@ -0,0 +1,31 @@ +/* + Unix SMB/CIFS Implementation. + LDAP protocol helper functions for SAMBA + Copyright (C) Volker Lendecke 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +*/ + +#ifndef _SMB_LDAP_H_ +#define _SMB_LDAP_H_ + +#include "../libcli/ldap/ldap_message.h" +#include "librpc/gen_ndr/misc.h" + +struct tevent_context; +struct cli_credentials; +struct dom_sid; + +#endif diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c index 73bbcd15cb..8b6794374b 100644 --- a/source4/torture/ldap/cldap.c +++ b/source4/torture/ldap/cldap.c @@ -23,7 +23,7 @@ #include "includes.h" #include "libcli/cldap/cldap.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "librpc/gen_ndr/netlogon.h" #include "torture/torture.h" #include "param/param.h" -- cgit