From 84a140f18722518eb0f40737085dd3b3958a3a02 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 18 Mar 2009 17:43:11 +0100
Subject: [PATCH] move source4/libcli/cldap => libcli/cldap

metze
---
 {source4/libcli => libcli}/cldap/cldap.c | 12 +++++++-----
 {source4/libcli => libcli}/cldap/cldap.h |  0
 libcli/cldap/config.mk                   |  7 +++++++
 source4/headermap.txt                    |  2 +-
 source4/libcli/config.mk                 |  7 -------
 5 files changed, 15 insertions(+), 13 deletions(-)
 rename {source4/libcli => libcli}/cldap/cldap.c (99%)
 rename {source4/libcli => libcli}/cldap/cldap.h (100%)
 create mode 100644 libcli/cldap/config.mk

diff --git a/source4/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
similarity index 99%
rename from source4/libcli/cldap/cldap.c
rename to libcli/cldap/cldap.c
index 0f2175b42dd..561ae8037c3 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -35,15 +35,17 @@
 #include "includes.h"
 #include <tevent.h>
 #include "../lib/util/dlinklist.h"
-#include "libcli/ldap/ldap.h"
-#include "libcli/ldap/ldap_ndr.h"
-#include "libcli/cldap/cldap.h"
+#include "../libcli/ldap/ldap_message.h"
+#include "../libcli/ldap/ldap_ndr.h"
+#include "../libcli/cldap/cldap.h"
 #include "../lib/tsocket/tsocket.h"
-#include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "../libcli/security/dom_sid.h"
+#include "../librpc/gen_ndr/ndr_nbt.h"
 #include "../lib/util/asn1.h"
 #include "../lib/util/tevent_ntstatus.h"
 
+#undef strcasecmp
+
 /*
   context structure for operations on cldap packets
 */
diff --git a/source4/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
similarity index 100%
rename from source4/libcli/cldap/cldap.h
rename to libcli/cldap/cldap.h
diff --git a/libcli/cldap/config.mk b/libcli/cldap/config.mk
new file mode 100644
index 00000000000..a4a75b49091
--- /dev/null
+++ b/libcli/cldap/config.mk
@@ -0,0 +1,7 @@
+[SUBSYSTEM::LIBCLI_CLDAP]
+PUBLIC_DEPENDENCIES = LIBCLI_LDAP
+PRIVATE_DEPENDENCIES = LIBTSOCKET LIBSAMBA-UTIL UTIL_TEVENT LIBLDB LIBCLI_NETLOGON
+
+LIBCLI_CLDAP_OBJ_FILES = ../libcli/cldap/cldap.o
+# PUBLIC_HEADERS += ../libcli/cldap/cldap.h
+
diff --git a/source4/headermap.txt b/source4/headermap.txt
index d0d0a575d83..280d60beb2f 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -25,7 +25,7 @@ lib/registry/registry.h: registry.h
 libcli/util/werror.h: core/werror.h
 libcli/util/doserr.h: core/doserr.h
 libcli/util/ntstatus.h: core/ntstatus.h
-libcli/cldap/cldap.h: cldap.h
+../libcli/cldap/cldap.h: cldap.h
 auth/credentials/credentials.h: credentials.h
 auth/credentials/credentials_krb5.h: credentials/krb5.h
 rpc_server/dcerpc_server.h: dcerpc_server.h
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 1b87530af80..5b50bdfcbec 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -96,13 +96,6 @@ LIBCLI_DGRAM_OBJ_FILES = $(addprefix $(libclisrcdir)/dgram/, \
 	netlogon.o \
 	browse.o)
 
-[SUBSYSTEM::LIBCLI_CLDAP]
-PUBLIC_DEPENDENCIES = LIBCLI_LDAP
-PRIVATE_DEPENDENCIES = LIBTSOCKET LIBSAMBA-UTIL UTIL_TEVENT LIBLDB LIBCLI_NETLOGON
-
-LIBCLI_CLDAP_OBJ_FILES = $(libclisrcdir)/cldap/cldap.o
-# PUBLIC_HEADERS += $(libclisrcdir)/cldap/cldap.h
-
 [SUBSYSTEM::LIBCLI_WREPL]
 PUBLIC_DEPENDENCIES = NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET
 
-- 
2.11.4.GIT