summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-24 12:50:43 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-24 17:55:40 +0100
commit18b30e5646d7a484c1714eac9b9ce1f8c1a8241a (patch)
tree378d1ebe074f898e28a70f210ec1033ab4ebbd9c
parent7aaec963c1764869b042240fb5b5d6a339ee052b (diff)
downloadsamba-18b30e5646d7a484c1714eac9b9ce1f8c1a8241a.tar.gz
samba-18b30e5646d7a484c1714eac9b9ce1f8c1a8241a.tar.bz2
samba-18b30e5646d7a484c1714eac9b9ce1f8c1a8241a.zip
libcli/ldap: move ldap_ndr from source4/ to toplevel
metze
-rw-r--r--libcli/ldap/config.mk10
-rw-r--r--libcli/ldap/ldap_ndr.c (renamed from source4/libcli/ldap/ldap_ndr.c)2
-rw-r--r--libcli/ldap/ldap_ndr.h (renamed from source4/libcli/ldap/ldap_ndr.h)0
-rw-r--r--source4/headermap.txt2
-rw-r--r--source4/libcli/ldap/config.mk7
5 files changed, 12 insertions, 9 deletions
diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk
index 02397cb43a..22cad8cfbc 100644
--- a/libcli/ldap/config.mk
+++ b/libcli/ldap/config.mk
@@ -1,7 +1,15 @@
[SUBSYSTEM::LIBCLI_LDAP_MESSAGE]
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBLDB
-PRIVATE_DEPENDENCIES = ASN1_UTIL
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL ASN1_UTIL
LIBCLI_LDAP_MESSAGE_OBJ_FILES = $(addprefix ../libcli/ldap/, \
ldap_message.o)
PUBLIC_HEADERS += ../libcli/ldap/ldap_message.h ../libcli/ldap/ldap_errors.h
+
+[SUBSYSTEM::LIBCLI_LDAP_NDR]
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB NDR_MISC NDR_SECURITY
+
+LIBCLI_LDAP_NDR_OBJ_FILES = ../libcli/ldap/ldap_ndr.o
+PUBLIC_HEADERS += ../libcli/ldap/ldap_ndr.h
+
diff --git a/source4/libcli/ldap/ldap_ndr.c b/libcli/ldap/ldap_ndr.c
index f0a11ba41f..dd820ff8d5 100644
--- a/source4/libcli/ldap/ldap_ndr.c
+++ b/libcli/ldap/ldap_ndr.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "lib/ldb/include/ldb.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "libcli/ldap/ldap_ndr.h"
diff --git a/source4/libcli/ldap/ldap_ndr.h b/libcli/ldap/ldap_ndr.h
index ee1f702c78..ee1f702c78 100644
--- a/source4/libcli/ldap/ldap_ndr.h
+++ b/libcli/ldap/ldap_ndr.h
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 6417603d1d..8287044622 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -51,7 +51,7 @@ param/share.h: share.h
../lib/util/wrap_xattr.h: wrap_xattr.h
../libcli/ldap/ldap_message.h: ldap_message.h
../libcli/ldap/ldap_errors.h: ldap_errors.h
-libcli/ldap/ldap_ndr.h: ldap_ndr.h
+../libcli/ldap/ldap_ndr.h: ldap_ndr.h
../lib/tevent/tevent.h: tevent.h
../lib/tevent/tevent_internal.h: tevent_internal.h
auth/session.h: samba/session.h
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index a1f34a6513..f0c0f5295d 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,7 +1,7 @@
[SUBSYSTEM::LIBCLI_LDAP]
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTEVENT LIBPACKET
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS \
- LDAP_ENCODE LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE
+ LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE
LIBCLI_LDAP_OBJ_FILES = $(addprefix $(libclisrcdir)/ldap/, \
ldap_client.o ldap_bind.o \
@@ -10,8 +10,3 @@ PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap.h
$(eval $(call proto_header_template,$(libclisrcdir)/ldap/ldap_proto.h,$(LIBCLI_LDAP_OBJ_FILES:.o=.c)))
-[SUBSYSTEM::LDAP_ENCODE]
-PRIVATE_DEPENDENCIES = LIBLDB
-
-LDAP_ENCODE_OBJ_FILES = $(libclisrcdir)/ldap/ldap_ndr.o
-PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap_ndr.h