../librpc/ndr/ndr.c
../librpc/ndr/ndr_misc.c
../librpc/gen_ndr/ndr_misc.c
- ../librpc/gen_ndr/ndr_security.c
- ../librpc/ndr/ndr_sec_helper.c
../librpc/ndr/ndr_string.c
../librpc/ndr/uuid.c
- librpc/ndr/util.c
- ../librpc/gen_ndr/ndr_dcerpc.c'''
+ librpc/ndr/util.c'''
LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
../librpc/gen_ndr/ndr_lsa.c'''
../libcli/security/sddl.c
../libcli/security/secacl.c ${PTHREADPOOL_SRC}
lib/fncall.c
- libads/krb5_errs.c lib/system_smbd.c lib/audit.c ${LIBNDR_SRC}
+ libads/krb5_errs.c lib/system_smbd.c lib/audit.c
lib/file_id.c lib/idmap_cache.c
../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
-NMBD_SRC = '${NMBD_SRC1} ${PROFILE_SRC} ${LIBNDR_GEN_SRC0}'
+NMBD_SRC = '${NMBD_SRC1} ${PROFILE_SRC}'
SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
${LIBNET_SRC} ${LIBNET_DSSYNC_SRC} ${LIBNET_SAMSYNC_SRC}
${LIB_EVENTLOG_SRC} ${REGFIO_SRC}'''
-CUPS_SRC = '''client/smbspool.c ${LIBNDR_GEN_SRC0}'''
+CUPS_SRC = '''client/smbspool.c'''
NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
../nsswitch/libwbclient/wbc_async.c
- ../nsswitch/libwbclient/wb_reqtrans.c
- ${LIBNDR_GEN_SRC0}'''
+ ../nsswitch/libwbclient/wb_reqtrans.c'''
-MASKTEST_SRC = '''torture/masktest.c
- ${LIBNDR_GEN_SRC0}'''
+MASKTEST_SRC = '''torture/masktest.c'''
-MSGTEST_SRC = '''torture/msgtest.c
- ${LIBNDR_GEN_SRC0}'''
+MSGTEST_SRC = '''torture/msgtest.c'''
LOCKTEST_SRC = '''torture/locktest.c ${LOCKING_SRC}
- ${LIBNDR_GEN_SRC0} ${FNAME_UTIL_SRC}'''
+ ${FNAME_UTIL_SRC}'''
NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
-PDBTEST_SRC = '''torture/pdbtest.c
- ${LIBNDR_GEN_SRC0}'''
+PDBTEST_SRC = '''torture/pdbtest.c'''
VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c ${READLINE_SRC}'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
LOCKTEST2_SRC = '''torture/locktest2.c ${LOCKING_SRC}
- ${LIBNDR_GEN_SRC0} ${FNAME_UTIL_SRC}'''
+ ${FNAME_UTIL_SRC}'''
SMBCACLS_SRC = '''utils/smbcacls.c
${LIBMSRPC_SRC}
DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
-SMBFILTER_SRC = '''utils/smbfilter.c
- ${LIBNDR_GEN_SRC0}'''
+SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
libsmb/samlogon_cache.c
${LIBNMB_SRC}
${LIBCLI_LDAP_NDR_SRC}
- ${LIBNDR_GEN_SRC0} ${LIBNDR_NETLOGON_SRC}'''
+ ${LIBNDR_NETLOGON_SRC}'''
VLP_SRC = '''printing/tests/vlp.c
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
source='${LIBNDR_GEN_SRC}',
+ deps='LIBNDR NDR_SECURITY NDR_DCERPC',
vars=locals())
bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='NSS_WRAPPER iconv LIBCRYPTO',
+ deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
LIBMSRPC_GEN LIBADS LIBADS_SERVER LIBADS_PRINTER''',
vars=locals())
-#FIXME
bld.SAMBA_SUBSYSTEM('LIBNDR',
source=LIBNDR_SRC,
vars=locals())
deps='replace',
source='../lib/compression/lzxpress.c')
-#FIXME
bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
- source=LIBNDR_SRC,
+ source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
+ deps='LIBNDR',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
+ source='../librpc/gen_ndr/ndr_dcerpc.c',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
source=NMBD_SRC,
deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
- POPT_SAMBA KRBCLIENT''',
+ POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSARPC''',
install_path='${SBINDIR}',
vars=locals())
bld.SAMBA_BINARY('smbspool',
source=CUPS_SRC,
deps='''talloc tdb tevent resolv cap libwbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
- KRBCLIENT ASN1_UTIL LIBTSOCKET''',
+ KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('testparm',
bld.SAMBA_BINARY('smbtorture',
source=SMBTORTURE_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
- LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET''',
+ LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('smbconftort',
bld.SAMBA_BINARY('masktest',
source=MASKTEST_SRC,
deps='''talloc tdb cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
- ASN1_UTIL LIBTSOCKET''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('msgtest',
bld.SAMBA_BINARY('locktest',
source=LOCKTEST_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('nsstest',
bld.SAMBA_BINARY('pdbtest',
source=PDBTEST_SRC,
deps='''talloc tdb cap resolv libwbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
- SMBLDAP POPT_SAMBA''',
+ SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('vfstest',
bld.SAMBA_BINARY('locktest2',
source=LOCKTEST2_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET''',
+ ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('debug2html',
bld.SAMBA_BINARY('smbfilter',
source=SMBFILTER_SRC,
- deps='''talloc tevent cap resolv libwbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET''',
+ deps='''talloc tevent cap resolv libwbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
+ NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('versiontest',
source=NTLM_AUTH_SRC,
deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
- PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER''',
+ PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
+ NDR_SAMR NDR_LSARPC''',
vars=locals())
bld.SAMBA_BINARY('timelimit',