[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Tue Nov 30 13:50:03 MST 2010
The branch, v3-6-test has been updated
via 7d3e3e8 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice.
via 911a067 s3-waf: use LIBCLI_NDR_NETLOGON.
via dfa4baf s3-waf: convert LIBNBT into a subsystem.
via 2eef9ce s3-waf: convert SPNEGO_PARSE into a subsystem.
via e5730ea s3-waf: use SLCACHE in ntlm_auth.
via ea37b47 s3-waf: use TLDAP in smbtorture.
via a8b61b2 s3-waf: convert NPA_TSTREAM into a subsystem.
via 2ee0df4 s3-waf: add LIBDRSUAPI subsystem.
via 53cba28 s3-waf: let SMBD_BASE depend on NDR_NOTIFY.
via 27709de s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT.
via 846a879 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL.
via abf9acc s3-waf: convert LIBCLI_SPOOLSS into a subsystem.
via 4592d69 s3-waf: convert RPCCLI_EPMAPPER into a subsystem.
via 63a3119 s3-waf: convert RPCCLI_EVENTLOG into a subsystem.
via 6e61e84 s3-waf: convert RPCCLI_NTSVCS into a subsystem.
via 9131ebf s3-waf: convert RPCCLI_DRSUAPI into a subsystem.
via 74f2b03 s3-waf: convert RPCCLI_DFS into a subsystem.
via 7b38f01 s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem.
via cd6b180 s3-waf: convert RPCCLI_DSSETUP into a subsystem.
via dbc3713 s3-waf: convert RPCCLI_SVCCTL into a subsystem.
via 6fa22f2 s3-waf: convert RPCCLI_WKSSVC into a subsystem.
via 1585a2c s3-waf: convert RPCCLI_SRVSVC into a subsystem.
via 74d129c s3-waf: convert LIBCLI_NETLOGON into a subsystem.
via 2733c70 s3-waf: convert LIBCLI_LSA into a subsystem.
via e635a95 s3-waf: convert LIBCLI_SAMR into a subsystem.
via 4466ab2 s3-waf: convert PARAM_UTIL into a subsystem.
via 41a538f s3-waf: convert TOKEN_UTIL into a subsystem.
via 1cb441b s3-waf: convert REG_EVENTLOG into a subsystem.
via d394701 s3-waf: convert LIBNMB into a subsystem.
via 36aea8c s3-waf: convert FNAME_UTIL into a subsystem.
from 8268e03 s3 docs: Reword posix locking text to answer a common question
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 7d3e3e8a031dd7b48d683bd6d41f37f23872e54f
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 19:05:36 2010 +0100
s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Nov 30 19:52:59 CET 2010 on sn-devel-104
(cherry picked from commit 88b61a3b295f83e18d3e3b8900e39b741d2c6b86)
commit 911a067a305a35587fb2e137b8b8a1aa6781c47f
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 19:00:09 2010 +0100
s3-waf: use LIBCLI_NDR_NETLOGON.
Guenther
(cherry picked from commit 9d6bfdf92d06bd3420299aee2e5c2445c62d70a5)
commit dfa4baf301f77b9dddb03699c5e70ed6acd9a458
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:56:26 2010 +0100
s3-waf: convert LIBNBT into a subsystem.
Guenther
(cherry picked from commit 8333b029eaf9f7582cd2c9b928db40bf0c3b571d)
commit 2eef9ce18d3456bafc01f9861848746957897fe1
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:52:21 2010 +0100
s3-waf: convert SPNEGO_PARSE into a subsystem.
Guenther
(cherry picked from commit 72b6936534d38d333fc518de14270d8048ab4541)
commit e5730ea247fd615b9626f237c4555e91ec418820
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:48:38 2010 +0100
s3-waf: use SLCACHE in ntlm_auth.
Guenther
(cherry picked from commit b31c0e41045b90e4f1593c762a0ce07f06676a48)
commit ea37b47244d40562c3fa930d150b6c175158f6e0
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:40:30 2010 +0100
s3-waf: use TLDAP in smbtorture.
Guenther
(cherry picked from commit 313123705be011334654ce0c8ebaaf21d8ced8cb)
commit a8b61b2f07413e39e9e02245e75c885754304ef5
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:17:40 2010 +0100
s3-waf: convert NPA_TSTREAM into a subsystem.
Guenther
(cherry picked from commit 67f2d4f45c2f0b3f0845f7c688fdc8a230d3e1f9)
commit 2ee0df47ab4f1844ed130f33a3b91ab637a17d05
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:07:21 2010 +0100
s3-waf: add LIBDRSUAPI subsystem.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Nov 30 18:58:42 CET 2010 on sn-devel-104
(cherry picked from commit d245ec848280f2120626e984dea2756c033c93f1)
commit 53cba28e842fa6cdc389b07bc41fa17c12a51b9c
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:01:13 2010 +0100
s3-waf: let SMBD_BASE depend on NDR_NOTIFY.
Guenther
(cherry picked from commit 193daf857729073d3166ea5e377ed1743cd2b26b)
commit 27709de90a5c09f8081281a72a4020eeddc12f30
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:58:13 2010 +0100
s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT.
Guenther
(cherry picked from commit a5ede16bb7462eed6f709ab2b4118db3e498d6a3)
commit 846a879a7834bd7521a576a5bdd0a408584c080f
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:56:03 2010 +0100
s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL.
Guenther
(cherry picked from commit 4ca43d9bc1295e3bc28fb8b11ce8746c5af6524e)
commit abf9accfc11847adc3047eff1ccbd471d7b24f32
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:50:32 2010 +0100
s3-waf: convert LIBCLI_SPOOLSS into a subsystem.
Guenther
(cherry picked from commit 5db1a399d586fd665382e625a5cdd0d1b995df27)
commit 4592d69b5317e47e3f587e05d5bf0552d0aae231
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:46:56 2010 +0100
s3-waf: convert RPCCLI_EPMAPPER into a subsystem.
Guenther
(cherry picked from commit e80e5c5b8a88a23d3fdf11e52d5f3bef2cdeb31b)
commit 63a3119952683ce7478f5a77dbd6159e81167b4e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:45:25 2010 +0100
s3-waf: convert RPCCLI_EVENTLOG into a subsystem.
Guenther
(cherry picked from commit aaa31e7b22342157c9982107a6af67c06b01ef93)
commit 6e61e84dd3f4a66408f0c6828830194022496d69
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:44:25 2010 +0100
s3-waf: convert RPCCLI_NTSVCS into a subsystem.
Guenther
(cherry picked from commit d29f9e4846d86002732f37703a5b21b759be745a)
commit 9131ebfd7350c195ba70ffb36ea8060d41777a41
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:43:09 2010 +0100
s3-waf: convert RPCCLI_DRSUAPI into a subsystem.
Guenther
(cherry picked from commit d37f54d8807166b9008c9d3fa11789e1936f4c0e)
commit 74f2b0347fd420c01a6effea20212ff622406da0
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:40:38 2010 +0100
s3-waf: convert RPCCLI_DFS into a subsystem.
Guenther
(cherry picked from commit ac290574e2ff49c9be880e545d1255f687dcc9ec)
commit 7b38f018b46862b81f89306c179616e6f523a6f8
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:38:44 2010 +0100
s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem.
Guenther
(cherry picked from commit 5cedef39d7f4208d22ce3c7fd48c19d5f8a8e4d1)
commit cd6b18004b2e27c371f63d3b1f55a4f0d58a275d
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:36:13 2010 +0100
s3-waf: convert RPCCLI_DSSETUP into a subsystem.
Guenther
(cherry picked from commit 82b440835dfc24be114f08ee1f2824aba7ac7260)
commit dbc371311abe9dc9a7bf7361882586d393db337b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:21:38 2010 +0100
s3-waf: convert RPCCLI_SVCCTL into a subsystem.
Guenther
(cherry picked from commit 2013c9c391ee0324039842ec2f8acd4addd33d85)
commit 6fa22f2f7c370d6330fd1c6a988d1e78f9d5e37e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:19:12 2010 +0100
s3-waf: convert RPCCLI_WKSSVC into a subsystem.
Guenther
(cherry picked from commit a8d005d439489c939051436eb8dbb75ff1cf9fbe)
commit 1585a2c1a872b85006bd25bbcd779d7eeb0b8fed
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:15:43 2010 +0100
s3-waf: convert RPCCLI_SRVSVC into a subsystem.
Guenther
(cherry picked from commit f9f9b798599262390cdec14d410fd3c8b94cd871)
commit 74d129c2a3b29a624bac788f10bc369c8762111f
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:27:37 2010 +0100
s3-waf: convert LIBCLI_NETLOGON into a subsystem.
Guenther
(cherry picked from commit 75f088f898993f7417520f2623611c689a58563b)
commit 2733c70622401cb55202dfb12fa5f77be6ab7a4d
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 17:09:34 2010 +0100
s3-waf: convert LIBCLI_LSA into a subsystem.
Guenther
(cherry picked from commit 656e849ce84c4b35e6f93ae8f4fe8780a4109e34)
commit e635a955e95af434f0cc516bb38181816562ee9c
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 16:43:34 2010 +0100
s3-waf: convert LIBCLI_SAMR into a subsystem.
Guenther
(cherry picked from commit d16e77e1233b912d90d4c586176529d3361cc85e)
commit 4466ab25ca7eba2a9ff32fa4fee39a402580093d
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 16:25:37 2010 +0100
s3-waf: convert PARAM_UTIL into a subsystem.
Guenther
(cherry picked from commit 2beab2d6e5704ecbac278ecd4c00dd162cda4197)
commit 41a538f8146967a2249c6751191df650325432dc
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 16:16:22 2010 +0100
s3-waf: convert TOKEN_UTIL into a subsystem.
Guenther
(cherry picked from commit 33c82cd5dd67c8fa509c326fed85a90045d896d0)
commit 1cb441b76a9cc586bd04b643b902d41034df3478
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 15:12:52 2010 +0100
s3-waf: convert REG_EVENTLOG into a subsystem.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Nov 30 16:25:51 CET 2010 on sn-devel-104
(cherry picked from commit b2a1c1e425411eb1a12ddb3a230cbcd5240f771e)
commit d394701c2f272c6d1b36c2e97bb20470f7c8d0d3
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 14:56:26 2010 +0100
s3-waf: convert LIBNMB into a subsystem.
Guenther
(cherry picked from commit 254dea0596b32431b70f48a8a9413c54b66c9925)
commit 36aea8c81f09e25d6d32c18eeb78706a071182b6
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 14:29:31 2010 +0100
s3-waf: convert FNAME_UTIL into a subsystem.
Guenther
(cherry picked from commit 12d73f2cb8aec5e54fb21c0844624ab0b02c6228)
-----------------------------------------------------------------------
Summary of changes:
source3/auth/wscript_build | 8 +-
source3/wscript_build | 362 ++++++++++++++++++++++---------------------
2 files changed, 191 insertions(+), 179 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 0fd28bc..e740f87 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -10,7 +10,7 @@ AUTH_WBC_SRC = 'auth_wbc.c'
AUTH_SCRIPT_SRC = 'auth_script.c'
AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
-AUTH_SRC = '''auth.c auth_util.c token_util.c
+AUTH_SRC = '''auth.c auth_util.c
server_info.c
server_info_sam.c
user_info.c
@@ -18,9 +18,13 @@ AUTH_SRC = '''auth.c auth_util.c token_util.c
user_krb5.c
auth_compat.c auth_ntlmssp.c'''
+bld.SAMBA_SUBSYSTEM('TOKEN_UTIL',
+ source='token_util.c',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('auth',
source=AUTH_SRC,
- deps='''PLAINTEXT_AUTH SLCACHE DCUTIL''',
+ deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL''',
vars=locals())
bld.SAMBA_MODULE('auth_sam',
diff --git a/source3/wscript_build b/source3/wscript_build
index 56d7198..7e8af30 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -29,16 +29,9 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
PASSCHANGE_SRC = '''libsmb/passchange.c'''
-LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
- ../librpc/ndr/ndr_compression.c
- ../librpc/gen_ndr/ndr_drsuapi.c
- ../librpc/ndr/ndr_drsblobs.c
- ../librpc/gen_ndr/ndr_drsblobs.c'''
-
COMPRESSION_SRC = '../lib/compression/mszip.c'
-DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
- ${COMPRESSION_SRC}'''
+DRSUAPI_SRC = '''${COMPRESSION_SRC}'''
LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/ndr.c
@@ -48,67 +41,15 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/uuid.c
librpc/ndr/util.c'''
-LIBCLI_SPOOLSS_SRC = '''
- ../librpc/gen_ndr/cli_spoolss.c
- ../librpc/gen_ndr/ndr_spoolss_c.c
- rpc_client/cli_spoolss.c
+LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
-LIBCLI_EVENTLOG_SRC = '''
- ../librpc/gen_ndr/cli_eventlog.c
- ../librpc/gen_ndr/ndr_eventlog_c.c'''
-
-LIBCLI_NTSVCS_SRC = '''
- ../librpc/gen_ndr/cli_ntsvcs.c
- ../librpc/gen_ndr/ndr_ntsvcs_c.c'''
-
-LIBCLI_DRSUAPI_SRC = '''
- ../librpc/gen_ndr/cli_drsuapi.c
- ../librpc/gen_ndr/ndr_drsuapi_c.c'''
-
-LIBCLI_DFS_SRC = '''
- ../librpc/gen_ndr/cli_dfs.c
- ../librpc/gen_ndr/ndr_dfs_c.c'''
-
-LIBCLI_INITSHUTDOWN_SRC = '''
- ../librpc/gen_ndr/cli_initshutdown.c
- ../librpc/gen_ndr/ndr_initshutdown_c.c'''
-
-LIBCLI_DSSETUP_SRC = '''
- ../librpc/gen_ndr/cli_dssetup.c
- ../librpc/gen_ndr/ndr_dssetup_c.c'''
-
-LIBCLI_SVCCTL_SRC = '''
- ../librpc/gen_ndr/cli_svcctl.c
- ../librpc/gen_ndr/ndr_svcctl_c.c'''
-
-LIBCLI_WKSSVC_SRC = '''
- ../librpc/gen_ndr/cli_wkssvc.c
- ../librpc/gen_ndr/ndr_wkssvc_c.c'''
-
-LIBCLI_SRVSVC_SRC = '''
- ../librpc/gen_ndr/cli_srvsvc.c
- ../librpc/gen_ndr/ndr_srvsvc_c.c'''
-
-LIBCLI_LSA_SRC = '''
- ../librpc/gen_ndr/cli_lsa.c
- ../librpc/gen_ndr/ndr_lsa_c.c
- rpc_client/cli_lsarpc.c
+LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
rpc_client/init_lsa.c'''
-LIBCLI_SAMR_SRC = '''
- ../librpc/gen_ndr/cli_samr.c
- ../librpc/gen_ndr/ndr_samr_c.c
- rpc_client/cli_samr.c'''
-
-LIBCLI_NETLOGON_SRC = '''
- ../librpc/gen_ndr/cli_netlogon.c
- ../librpc/gen_ndr/ndr_netlogon_c.c
- rpc_client/cli_netlogon.c'''
+LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-LIBCLI_EPMAPPER_SRC = '''
- ../librpc/gen_ndr/cli_epmapper.c
- ../librpc/gen_ndr/ndr_epmapper_c.c'''
+LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c'
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
@@ -178,7 +119,9 @@ LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
POPT_LIB_SRC = '''lib/popt_common.c'''
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
+PARAM_UTIL_SRC = '''param/util.c'''
+
+PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
@@ -204,12 +147,7 @@ LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
passdb/machine_sid.c'''
-LIBNBT_SRC = '''../libcli/nbt/nbtname.c
- ../libcli/netlogon.c
- ../libcli/ndr_netlogon.c
- ../librpc/gen_ndr/ndr_nbt.c
- ../librpc/gen_ndr/ndr_svcctl.c
- ../librpc/ndr/ndr_svcctl.c'''
+LIBNBT_SRC = '''../libcli/netlogon.c'''
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
@@ -252,16 +190,12 @@ SCHANNEL_SRC = '''../libcli/auth/credentials.c
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clikrb5.c libsmb/clispnego.c
- ../libcli/auth/spnego_parse.c
libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
- libsmb/smb_seal.c libsmb/async_smb.c
- ${LIBNMB_SRC}
- ${LIBNBT_SRC}
- ${DRSUAPI_SRC}'''
+ libsmb/smb_seal.c libsmb/async_smb.c'''
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
@@ -276,8 +210,7 @@ LIBMSRPC_SRC = '''
../librpc/rpc/binding.c
../librpc/rpc/dcerpc_util.c
librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c
- ${LIBCLI_EPMAPPER_SRC}'''
+ ../librpc/rpc/binding_handle.c'''
#
# registry-related objects
@@ -322,10 +255,11 @@ REG_SMBCONF_SRC = '''
registry/reg_util_token.c
registry/reg_api_util.c'''
+REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
+
REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
- registry/reg_eventlog.c
registry/reg_perfcount.c'''
SERVICES_SRC = '''services/svc_spoolss.c
@@ -337,8 +271,7 @@ SERVICES_SRC = '''services/svc_spoolss.c
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
- ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
rpc_server/rpc_handles.c'''
@@ -352,7 +285,7 @@ RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
@@ -378,8 +311,7 @@ PROFILES_SRC = '''utils/profiles.c'''
OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
smbd/oplock_onefs.c'''
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
- librpc/gen_ndr/ndr_notify.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
FNAME_UTIL_SRC = '''smbd/filename_util.c'''
@@ -473,7 +405,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_pam_auth_crap.c
winbindd/winbindd_pam_chng_pswd_auth_crap.c
auth/auth_util.c
- auth/token_util.c
auth/user_util.c
auth/check_samsec.c
auth/server_info.c
@@ -483,12 +414,8 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
+ ${RPC_NCACN_NP}
${TDB_VALIDATE_SRC}
- ${LIBCLI_DSSETUP_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
@@ -548,13 +475,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
- ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
+ ${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}
- ${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -591,28 +513,24 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
SWAT_SRC = '''${SWAT_SRC1}
- ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
- ${LIBCLI_SAMR_SRC}
+ ${PASSCHANGE_SRC}
rpc_client/init_lsa.c'''
-STATUS_SRC = '''utils/status.c utils/status_profile.c
- ${FNAME_UTIL_SRC}'''
+STATUS_SRC = '''utils/status.c utils/status_profile.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
-SMBTREE_SRC = '''utils/smbtree.c
- ${LIBCLI_SRVSVC_SRC}'''
+SMBTREE_SRC = '''utils/smbtree.c'''
TESTPARM_SRC = 'utils/testparm.c'
-SMBTA_UTIL_SRC = '''utils/smbta-util.c ${FNAME_UTIL_SRC}'''
+SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}
- ${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
PDBEDIT_SRC = '''utils/pdbedit.c'''
@@ -630,17 +548,6 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
rpcclient/cmd_winreg.c'''
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
- ${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_EVENTLOG_SRC}
- ${LIBCLI_NTSVCS_SRC}
- ${LIBCLI_DRSUAPI_SRC}
- ${LIBCLI_DFS_SRC}
- ${LIBCLI_DSSETUP_SRC}
- ${LIBCLI_WKSSVC_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -662,9 +569,7 @@ LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
libsmb/libsmb_xattr.c
libsmb/libsmb_setget.c'''
-LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}'''
+LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}'''
LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
@@ -689,13 +594,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
lib/netapi/netlogon.c'''
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
- auth/token_util.c
- ${LIBCLI_INITSHUTDOWN_SRC}
- ${LIBCLI_WKSSVC_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -705,7 +603,6 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
client/dnsbrowse.c'''
CLIENT_SRC = '''${CLIENT_SRC1}
- ${LIBCLI_SRVSVC_SRC}
rpc_client/init_lsa.c'''
LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
@@ -741,21 +638,11 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_dns.c utils/net_ads_gpo.c
utils/net_conf.c utils/net_join.c utils/net_user.c
utils/net_group.c utils/net_file.c utils/net_registry.c
- auth/token_util.c utils/net_dom.c utils/net_share.c
+ utils/net_dom.c utils/net_share.c
utils/net_g_lock.c
utils/net_serverid.c
utils/net_eventlog.c
utils/net_printing.c
- ${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_DRSUAPI_SRC}
- ${LIBCLI_INITSHUTDOWN_SRC}
- ${LIBCLI_DSSETUP_SRC}
- ${LIBCLI_SVCCTL_SRC}
- ${LIBCLI_WKSSVC_SRC}
- ${LIBCLI_SRVSVC_SRC}
- ${LIBCLI_LSA_SRC}
- ${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c
registry/reg_parse.c registry/reg_format.c
@@ -769,7 +656,7 @@ NET_SRC = '''${NET_SRC1}
CUPS_SRC = '''client/smbspool.c'''
-NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
+NMBLOOKUP_SRC = '''utils/nmblookup.c'''
SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
torture/denytest.c torture/mangle_test.c
@@ -777,7 +664,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
torture/test_async_echo.c
torture/test_posix_append.c'''
-SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
+SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
../nsswitch/libwbclient/wbc_async.c
../nsswitch/libwbclient/wb_reqtrans.c'''
@@ -785,7 +672,7 @@ MASKTEST_SRC = '''torture/masktest.c'''
MSGTEST_SRC = '''torture/msgtest.c'''
-LOCKTEST_SRC = '''torture/locktest.c ${FNAME_UTIL_SRC}'''
+LOCKTEST_SRC = '''torture/locktest.c'''
NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
@@ -797,18 +684,15 @@ SMBICONV_SRC = '''torture/smbiconv.c'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-LOCKTEST2_SRC = '''torture/locktest2.c ${FNAME_UTIL_SRC}'''
+LOCKTEST2_SRC = '''torture/locktest2.c'''
-SMBCACLS_SRC = '''utils/smbcacls.c
- ${LIBCLI_LSA_SRC}'''
+SMBCACLS_SRC = '''utils/smbcacls.c'''
-SMBCQUOTAS_SRC = '''utils/smbcquotas.c
- ${LIBCLI_LSA_SRC}'''
+SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
- registry/reg_eventlog.c'''
+EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
SHARESEC_SRC0 = 'utils/sharesec.c'
SHARESEC_SRC = '''${SHARESEC_SRC0}'''
@@ -818,7 +702,7 @@ DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
- ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
+ ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC}'''
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
@@ -833,15 +717,12 @@ POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c \
NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
- ../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
- libsmb/samlogon_cache.c
- ${LIBNMB_SRC}'''
+ libsmb/clikrb5.c libads/kerberos.c'''
VLP_SRC = '''printing/tests/vlp.c
../lib/util/util_tdb.c
- ${LIBSAMBAUTIL_SRC}
- param/util.c'''
+ ${LIBSAMBAUTIL_SRC}'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
@@ -903,7 +784,9 @@ bld.SAMBA_LIBRARY('libnetapi',
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
- RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF''',
+ RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN''',
public_headers='lib/netapi/netapi.h',
private_library=True,
vars=locals())
@@ -911,7 +794,7 @@ bld.SAMBA_LIBRARY('libnetapi',
bld.SAMBA_LIBRARY('libsmbclient',
source=LIBSMBCLIENT_SRC,
public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
- LIBMSRPC_GEN LIBMSRPC''',
+ LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPCCLI_SRVSVC''',
public_headers='include/libsmbclient.h',
private_library=True,
vars=locals())
@@ -925,7 +808,8 @@ bld.SAMBA_LIBRARY('smbsharemodes',
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
- deps='ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL',
+ deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+ RPCCLI_EPMAPPER''',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
@@ -966,8 +850,13 @@ bld.SAMBA_SUBSYSTEM('PASSDB',
deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
vars=locals())
+bld.SAMBA_SUBSYSTEM('PARAM_UTIL',
+ source=PARAM_UTIL_SRC)
+
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
- source=PARAM_WITHOUT_REG_SRC)
+ source=PARAM_WITHOUT_REG_SRC,
+ deps='''PARAM_UTIL''',
+ vars=locals())
bld.SAMBA_SUBSYSTEM('PARAM',
source='',
@@ -993,7 +882,11 @@ bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
bld.SAMBA_SUBSYSTEM('REG_FULL',
source=REG_FULL_SRC,
- deps='REG_SMBCONF',
+ deps='REG_SMBCONF REG_EVENTLOG',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_EVENTLOG',
+ source=REG_EVENTLOG_SRC,
vars=locals())
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
@@ -1027,7 +920,12 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
bld.SAMBA_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
--
Samba Shared Repository
More information about the samba-cvs
mailing list