[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Nov 30 11:53:01 MST 2010
The branch, master has been updated
via 88b61a3 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice.
via 9d6bfdf s3-waf: use LIBCLI_NDR_NETLOGON.
via 8333b02 s3-waf: convert LIBNBT into a subsystem.
via 72b6936 s3-waf: convert SPNEGO_PARSE into a subsystem.
via b31c0e4 s3-waf: use SLCACHE in ntlm_auth.
via 3131237 s3-waf: use TLDAP in smbtorture.
via 67f2d4f s3-waf: convert NPA_TSTREAM into a subsystem.
from d245ec8 s3-waf: add LIBDRSUAPI subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 88b61a3b295f83e18d3e3b8900e39b741d2c6b86
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
commit 9d6bfdf92d06bd3420299aee2e5c2445c62d70a5
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 19:00:09 2010 +0100
s3-waf: use LIBCLI_NDR_NETLOGON.
Guenther
commit 8333b029eaf9f7582cd2c9b928db40bf0c3b571d
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
commit 72b6936534d38d333fc518de14270d8048ab4541
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
commit b31c0e41045b90e4f1593c762a0ce07f06676a48
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
commit 313123705be011334654ce0c8ebaaf21d8ced8cb
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 18:40:30 2010 +0100
s3-waf: use TLDAP in smbtorture.
Guenther
commit 67f2d4f45c2f0b3f0845f7c688fdc8a230d3e1f9
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
-----------------------------------------------------------------------
Summary of changes:
source3/wscript_build | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index fc1796a..7e8af30 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -29,12 +29,9 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
PASSCHANGE_SRC = '''libsmb/passchange.c'''
-LIBNDR_DRSUAPI_SRC = '../librpc/ndr/ndr_compression.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
@@ -150,9 +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'''
+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
@@ -195,14 +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
- ${LIBNBT_SRC}'''
+ libsmb/smb_seal.c libsmb/async_smb.c'''
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
@@ -278,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'''
@@ -293,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'''
@@ -422,7 +414,7 @@ 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}
rpc_client/init_netlogon.c
rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
@@ -672,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'''
@@ -725,8 +717,7 @@ 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'''
+ libsmb/clikrb5.c libads/kerberos.c'''
VLP_SRC = '''printing/tests/vlp.c
@@ -929,7 +920,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
bld.SAMBA_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA CLDAP LIBNMB LIBDRSUAPI',
+ deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
@@ -989,7 +980,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
LIBSMBCONF REG_FULL FNAME_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
- RPCCLI_SRVSVC
+ RPCCLI_SRVSVC NPA_TSTREAM
''',
vars=locals())
@@ -1047,6 +1038,11 @@ bld.SAMBA_SUBSYSTEM('LIBNMB',
source=LIBNMB_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBNBT',
+ source=LIBNBT_SRC,
+ deps='NDR_NBT_BUF LIBCLI_NDR_NETLOGON',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('SERVICES',
source=SERVICES_SRC,
vars=locals())
@@ -1059,6 +1055,10 @@ bld.SAMBA_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
+ source='../libcli/auth/spnego_parse.c',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('DCUTIL',
source=DCUTIL_SRC,
vars=locals())
@@ -1189,6 +1189,10 @@ bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('NPA_TSTREAM',
+ source=NPA_TSTREAM_SRC,
+ deps='NDR_NAMED_PIPE_AUTH')
+
########################## BINARIES #################################
@@ -1215,7 +1219,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
- RPCCLI_DSSETUP
+ RPCCLI_DSSETUP NPA_TSTREAM
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1332,7 +1336,7 @@ bld.SAMBA_BINARY('nmblookup',
bld.SAMBA_BINARY('smbtorture',
source=SMBTORTURE_SRC,
- deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
+ deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT TLDAP
LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
vars=locals())
@@ -1442,7 +1446,7 @@ bld.SAMBA_BINARY('ntlm_auth',
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
- NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB''',
+ NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
vars=locals())
bld.SAMBA_BINARY('timelimit',
--
Samba Shared Repository
More information about the samba-cvs
mailing list