X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fwscript_build;h=8bb7f4e26d98f4ffdcc3bea0bb064f192047d24d;hb=HEAD;hp=b6a1cadf1e4e3305ef4e7e51df973994cca3cab9;hpb=85753e4693eb589310012376f2ce606238c86e26;p=samba.git diff --git a/source3/wscript_build b/source3/wscript_build index b6a1cadf1e4..a28db001673 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -98,11 +98,13 @@ bld.SAMBA3_SUBSYSTEM('TLDAP', lib/tldap.c lib/tldap_util.c lib/tldap_gensec_bind.c + lib/tldap_tls_connect.c ''', deps=''' asn1util LIBTSOCKET samba3util + LIBTLS ''') bld.SAMBA3_BINARY('test_tldap', @@ -111,6 +113,7 @@ bld.SAMBA3_BINARY('test_tldap', asn1util LIBTSOCKET samba3util + LIBTLS smbconf cmocka ''', @@ -151,7 +154,7 @@ bld.SAMBA3_LIBRARY('samba-passdb', ''', abi_match=private_pdb_match, abi_directory='passdb/ABI', - vnum='0.28.0') + vnum='0.29.0') bld.SAMBA3_SUBSYSTEM('pdb', source=''' @@ -310,6 +313,14 @@ bld.SAMBA3_SUBSYSTEM('samba3util', iov_buf ''') +bld.SAMBA3_SUBSYSTEM('samba3-namearray', + source=''' + lib/util_namearray.c + ''', + deps=''' + samba-passdb + ''') + if bld.env.with_ctdb: SAMBA_CLUSTER_SUPPORT_SOURCES=''' lib/cluster_support.c @@ -422,7 +433,6 @@ bld.SAMBA3_LIBRARY('libsmb', libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c - libsmb/clispnego.c libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c @@ -431,7 +441,6 @@ bld.SAMBA3_LIBRARY('libsmb', libsmb/cliprint.c libsmb/clitrans.c libsmb/clisecdesc.c - libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c @@ -470,7 +479,7 @@ bld.SAMBA3_LIBRARY('secrets3', passdb/secrets_lsa.c ''', deps=''' - NDR_SECRETS + ndr-samba4 smbconf samba3util dbwrap @@ -496,8 +505,8 @@ bld.SAMBA3_LIBRARY('ads', libads/ldap.c libads/sasl.c libads/sasl_wrapping.c + libads/tls_wrapping.c libads/krb5_setpw.c - libads/kerberos_util.c libads/ldap_user.c libads/ads_struct.c libads/kerberos_keytab.c @@ -505,8 +514,8 @@ bld.SAMBA3_LIBRARY('ads', libads/ldap_utils.c libads/ldap_schema.c libads/util.c - libads/ndr.c libads/net_ads_setspn.c + libads/trusts_util.c ''', deps=''' cli-ldap-common @@ -520,7 +529,10 @@ bld.SAMBA3_LIBRARY('ads', libsmb DCUTIL smbldap - trusts_util + libcli_netlogon3 + msrpc3 + samba-passdb + NDR_ADS ''', private_library=True) @@ -572,7 +584,7 @@ bld.SAMBA3_LIBRARY('smbconf', ''', public_headers='../lib/smbconf/smbconf.h', pc_files=[], - vnum='0') + vnum='0.0.1') bld.SAMBA3_SUBSYSTEM('sysquotas', source=''' @@ -646,8 +658,6 @@ bld.SAMBA3_LIBRARY('smbd_base', smbd/sec_ctx.c smbd/srvstr.c smbd/vfs.c - smbd/perfcount.c - smbd/statcache.c smbd/seal.c smbd/posix_acls.c lib/sysacls.c @@ -743,6 +753,7 @@ bld.SAMBA3_LIBRARY('smbd_base', GNUTLS_HELPERS fd_handle cli_spoolss + samba3-namearray ''' + bld.env['dmapi_lib'] + bld.env['legacy_quota_libs'] + @@ -759,6 +770,7 @@ bld.SAMBA3_SUBSYSTEM('LOCKING', deps=''' tdb talloc + vfs LEASES_DB LEASES_UTIL NDR_OPEN_FILES @@ -775,11 +787,14 @@ bld.SAMBA3_SUBSYSTEM('LEASES_UTIL', deps='NDR_OPEN_FILES') if bld.CONFIG_GET("WITH_PROFILE"): + bld.SAMBA_SUBSYSTEM('PROFILE_READ', + source='profile/profile_read.c', + deps='gnutls talloc tdb') bld.SAMBA3_SUBSYSTEM('PROFILE', source='profile/profile.c', deps=''' samba-util - gnutls + PROFILE_READ ''') else: bld.SAMBA3_SUBSYSTEM('PROFILE', @@ -901,6 +916,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB', LIBTSOCKET LIBCLI_NETLOGON samba3util + smbconf addns lmhosts resolv @@ -932,14 +948,12 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE', source='libsmb/passchange.c', deps=''' LIBCLI_SAMR - INIT_LSA msrpc3 krb5samba ''') bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION', - source='lib/version.c', - deps='samba-util') + source='lib/version.c') bld.SAMBA3_SUBSYSTEM('SLCACHE', source='libsmb/samlogon_cache.c', @@ -968,15 +982,6 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL', libcli_lsa3 ''') -bld.SAMBA3_LIBRARY('trusts_util', - source='libsmb/trusts_util.c', - deps=''' - libcli_netlogon3 - msrpc3 - samba-passdb - ''', - private_library=True) - bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', deps='talloc samba3-util') @@ -987,7 +992,6 @@ bld.SAMBA3_LIBRARY('samba3-util', lib/util_str.c lib/adt_tree.c lib/util_malloc.c - lib/namearray.c lib/file_id.c lib/cbuf.c lib/per_thread_cwd.c @@ -1028,7 +1032,7 @@ bld.SAMBA3_SUBSYSTEM('errors3', bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR', source='rpc_client/cli_samr.c', - deps='RPC_NDR_SAMR INIT_SAMR') + deps='RPC_NDR_SAMR INIT_LSA INIT_SAMR') bld.SAMBA3_LIBRARY('libcli_lsa3', source='rpc_client/cli_lsarpc.c', @@ -1080,9 +1084,15 @@ bld.SAMBA3_SUBSYSTEM('RPCCLI_MDSSVC', ''', deps='mdssvc RPC_NDR_MDSSVC') +bld.SAMBA3_SUBSYSTEM('RPCCLI_WSP', + source=''' + rpc_client/wsp_cli.c + ''', + deps='tevent-util tstream_binding_handle') + bld.SAMBA3_SUBSYSTEM('INIT_LSA', source='rpc_client/init_lsa.c', - deps='samba-util') + deps='samba-util GNUTLS_HELPERS') bld.SAMBA3_SUBSYSTEM('INIT_SAMR', source='rpc_client/init_samr.c', @@ -1128,6 +1138,9 @@ bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE', source='lib/tdb_validate.c', deps='samba-util') +bld.SAMBA3_SUBSYSTEM('util_sd', + deps='smbclient', + source='lib/util_sd.c') bld.SAMBA3_BINARY('client/smbclient', source=''' @@ -1239,6 +1252,11 @@ bld.SAMBA3_PYTHON('pymdscli', deps=' '.join(['RPCCLI_MDSSVC', pytalloc_util, pyrpc_util]), realname='samba/samba3/mdscli.so') +bld.SAMBA3_PYTHON('pys3smbconf', + source='lib/smbconf/pys3smbconf.c', + deps='smbconf', + realname='samba/samba3/smbconf.so') + bld.SAMBA3_BINARY('spotlight2sparql', source=''' rpc_server/mdssvc/sparql_parser_test.c