From 41db2ab12cea20b271d690be554ab8e6095c2b4e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 6 Dec 2007 21:39:49 +0100 Subject: r26319: Split encoding functions out of libcli_ldap. (This used to be commit 95a6ef7fc8757ccfd90dbf0d6c9b5098f10b10b6) --- source4/auth/auth_sam.c | 2 +- source4/auth/config.mk | 1 + source4/cldap_server/netlogon.c | 2 +- source4/dsdb/common/sidmap.c | 3 ++- source4/dsdb/config.mk | 4 ++-- source4/dsdb/samdb/cracknames.c | 3 ++- source4/dsdb/samdb/ldb_modules/config.mk | 4 ++-- source4/dsdb/samdb/ldb_modules/password_hash.c | 3 ++- source4/dsdb/samdb/ldb_modules/samldb.c | 3 ++- source4/dsdb/samdb/samdb.c | 2 +- source4/dsdb/samdb/samdb_privilege.c | 2 +- source4/libcli/cldap/cldap.c | 1 + source4/libcli/ldap/config.mk | 13 +++++++++---- source4/libnet/libnet_samsync_ldb.c | 2 +- source4/rpc_server/lsa/dcesrv_lsa.c | 1 + source4/rpc_server/lsa/lsa.h | 2 +- source4/rpc_server/samr/dcesrv_samr.c | 2 +- 17 files changed, 31 insertions(+), 19 deletions(-) diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index 86acb580b7..0885d8265a 100644 --- a/source4/auth/auth_sam.c +++ b/source4/auth/auth_sam.c @@ -28,7 +28,7 @@ #include "auth/auth_sam.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "param/param.h" extern const char *user_attrs[]; diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 0b927b8e58..789055408d 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -17,6 +17,7 @@ PRIVATE_DEPENDENCIES = auth_session PRIVATE_PROTO_HEADER = auth_sam.h OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB +PRIVATE_DEPENDENCIES = LDAP_ENCODE ####################### # Start MODULE auth_sam diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index beb1767138..b123027a7c 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "lib/events/events.h" diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index caf7c3ae4f..d277aa6543 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -24,7 +24,8 @@ #include "dsdb/common/flags.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" +#include "ldb.h" #include "util/util_ldb.h" #include "libcli/security/security.h" #include "param/param.h" diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index 77a9085f0e..ad9721458f 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -7,9 +7,9 @@ include samdb/ldb_modules/config.mk [SUBSYSTEM::SAMDB] PUBLIC_PROTO_HEADER = samdb/samdb_proto.h PUBLIC_HEADERS = samdb/samdb.h -PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 +PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \ - auth_system_session + auth_system_session LDAP_ENCODE OBJ_FILES = \ samdb/samdb.o \ samdb/samdb_privilege.o \ diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index dea00f7ab1..338bc4f138 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -27,10 +27,11 @@ #include "lib/ldb/include/ldb_errors.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "auth/auth.h" +#include "ldb.h" #include "util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "param/param.h" diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 3dce205eb3..b585d0da7f 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -75,7 +75,7 @@ OBJ_FILES = \ [MODULE::ldb_samldb] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LDAP_ENCODE INIT_FUNCTION = samldb_module_init OBJ_FILES = \ samldb.o @@ -143,7 +143,7 @@ SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = password_hash_module_init OBJ_FILES = password_hash.o -PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 +PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE # # End MODULE ldb_password_hash ################################################ diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 529b1aa96f..d139cc23a4 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -32,8 +32,9 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "ldb/include/ldb_errors.h" +#include "ldb/include/ldb.h" #include "ldb/include/ldb_private.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 85ca1a7f4b..3638b91799 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -33,8 +33,9 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "lib/ldb/include/ldb_errors.h" +#include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_private.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index 939de4b048..4366b7d0b9 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -29,7 +29,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "system/time.h" #include "system/filesys.h" #include "ldb_wrap.h" diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c index 0baa7ee794..3945dbb14b 100644 --- a/source4/dsdb/samdb/samdb_privilege.c +++ b/source4/dsdb/samdb/samdb_privilege.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "libcli/security/security.h" 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 diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 8ec058d845..ea6013391d 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -24,7 +24,7 @@ #include "includes.h" #include "libnet/libnet.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "util/util_ldb.h" diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index e054aaeffe..4375088e17 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -22,6 +22,7 @@ #include "rpc_server/lsa/lsa.h" #include "util/util_ldb.h" +#include "libcli/ldap/ldap_ndr.h" /* this type allows us to distinguish handle types diff --git a/source4/rpc_server/lsa/lsa.h b/source4/rpc_server/lsa/lsa.h index 3959311b99..db148d3dcb 100644 --- a/source4/rpc_server/lsa/lsa.h +++ b/source4/rpc_server/lsa/lsa.h @@ -25,7 +25,7 @@ #include "rpc_server/common/common.h" #include "auth/auth.h" #include "dsdb/samdb/samdb.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "lib/ldb/include/ldb_errors.h" #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 9a6ebe43b7..db659ef5a3 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -31,7 +31,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "dsdb/common/flags.h" #include "dsdb/samdb/samdb.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "libcli/security/security.h" #include "rpc_server/samr/proto.h" #include "util/util_ldb.h" -- cgit