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

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index da59e0ccec52dcc1b3f551a231836b1a5063d862..8bed38b557c8a2694fe666b86a4d05962dadfc4c 100644 (file)
--- 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 e40a1bd4ba1186dafef59827c2b1ea87e20ff2ad..fe7788f7738210f9e1f1f8e859dd2c71dda58194 100644 (file)
--- 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 7e867deff29f2d244c6d82558d55dc4eb8310b16..3592ffae727b9219741fa3edec38156f5d36c7d0 100644 (file)
--- 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"

diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c b/source4/dsdb/samdb/ldb_modules/local_password.c
index aa4d3af9e2dd6ca9489de1e411daeb8b95fecfa2..4f9cfd63d4ac6c89d820d4907a27ee407462e8ee 100644 (file)
--- 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 e6f6c66bcbbf5a231f2e1d2577974d7c051243b8..d9f15b8c809e90fe54386d35e805237833e9582d 100644 (file)
--- 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 9abc6115e673f1e4be090f2bcfc234f9c6802cd2..1b235f2a1bdacb5f67abd2eb5b59f2efe83df369 100644 (file)
--- 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 ac8f6c149687c6be3d967f0fb4eb68697a810f13..78fd43caac8ccfe5a3483d6ed2c9006b82313427 100644 (file)
--- 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 92c549ecd2a8798d4e96d6d8c4b963560954e592..00698eec46c68277b976f2fe70b76e9576c885bf 100644 (file)
--- 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 efa802d1738cd7b85f87b0522862992bb3939bf7..8b45285463d11a62e075c012d256b1962aedf275 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 */
 
-#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 9f81c4e534841d10f9b2d169aa43b60bf39d1ce0..dc1d987d76e17a5ec70553aec61fc6176e4607be 100644 (file)
--- 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_bind.c b/source4/libcli/ldap/ldap_bind.c
index 5e6a5faafa42d8ae8f32973df80172b408bec4ac..804c57c2b29a9f430141b124daf04f3d44d56174 100644 (file)
--- 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 eb532769362a10d5bd09e51c34789b59cfc5e8c6..281266361e418b1ebc360787e774a3a207af02c0 100644 (file)
--- 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 084de2e6dc3cac59d7b27321494957ff42aa464b..3b4da6bcf230cf0930ae118ab559ef017866259c 100644 (file)
--- 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 94b32b305bf252407f7fbdf9d2a289eca5c2de92..b0c024a361b609f734ba891f35a8a8e5f8a1b77c 100644 (file)
--- 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 f059e3882adc83d5eae2a8c66e34d9018886a81d..77bf3f0a35b8612e7ff863c86bebdbda748c5263 100644 (file)
--- 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
similarity index 100%
rename from source4/libcli/ldap/ldap.h
rename to source4/libcli/ldap/libcli_ldap.h

diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 73bbcd15cbdbc263fc4a53e25617c8b6f5d84dd1..8b6794374bb2c254af50b17f00a7580d71afd9b8 100644 (file)
--- 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"