summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-06 21:39:49 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:33 +0100
commit41db2ab12cea20b271d690be554ab8e6095c2b4e (patch)
tree3bafb5adbdacb1c0ca0f639ace6c9c1ae8e3d08a /source4/libcli
parent090d251c19e31450d8fc4af50e7c6b0c09af5f89 (diff)
downloadsamba-41db2ab12cea20b271d690be554ab8e6095c2b4e.tar.gz
samba-41db2ab12cea20b271d690be554ab8e6095c2b4e.tar.bz2
samba-41db2ab12cea20b271d690be554ab8e6095c2b4e.zip
r26319: Split encoding functions out of libcli_ldap.
(This used to be commit 95a6ef7fc8757ccfd90dbf0d6c9b5098f10b10b6)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/cldap/cldap.c1
-rw-r--r--source4/libcli/ldap/config.mk13
2 files changed, 10 insertions, 4 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 87a8957fbc..4c6bd68c13 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -35,6 +35,7 @@
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "libcli/cldap/cldap.h"
#include "lib/socket/socket.h"
#include "libcli/security/security.h"
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index adccd23eb1..444306b328 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -5,9 +5,14 @@ OBJ_FILES = ldap.o \
ldap_client.o \
ldap_bind.o \
ldap_msg.o \
- ldap_ndr.o \
ldap_ildap.o \
ldap_controls.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL GENSEC_SOCKET
-#FIXME: PRIVATE_DEPENDENCIES = gensec
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket NDR_SAMR LIBTLS ASN1_UTIL \
+ LDAP_ENCODE LIBNDR
+
+
+[SUBSYSTEM::LDAP_ENCODE]
+PUBLIC_PROTO_HEADER = ldap_ndr.h
+OBJ_FILES = ldap_ndr.o
+# FIXME PRIVATE_DEPENDENCIES = LIBLDB