[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Sep 24 22:09:54 MDT 2010
The branch, master has been updated
via db4bec3 s3-waf: convert LIBNET et al into subsystems.
via fd9ae12 s3-waf: convert PASSWD_UTIL into a subsystem.
from e325a5b talloc: Add a warning about talloc_autofree_context() and dlclose()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit db4bec3f4c4cf3940c6d39315af17bc621bbe99b
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 16:45:41 2010 -0700
s3-waf: convert LIBNET et al into subsystems.
Guenther
commit fd9ae125bc177763874af54e0776ebb005a4ae00
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 24 16:13:55 2010 -0700
s3-waf: convert PASSWD_UTIL into a subsystem.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/librpc/wscript_build | 5 +++++
source3/wscript_build | 42 +++++++++++++++++++++++++++++++-----------
2 files changed, 36 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 269c94d..dfeacf6 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -5,6 +5,11 @@ bld.SAMBA_SUBSYSTEM('NDR_LIBNETAPI',
public_deps='LIBNDR'
)
+bld.SAMBA_SUBSYSTEM('NDR_LIBNET_JOIN',
+ source='gen_ndr/ndr_libnet_join.c',
+ public_deps='LIBNDR'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
source='gen_ndr/ndr_messaging.c',
public_deps='LIBNDR'
diff --git a/source3/wscript_build b/source3/wscript_build
index 1affc2d..badea91 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -782,7 +782,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
${REG_FULL_SRC}
${BUILDOPT_SRC}
- ${LIBNET_SRC} ${LIBSMBCONF_SRC}
+ ${LIBSMBCONF_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_WINREG_SRC}
${LIBCLI_SRVSVC_SRC}
@@ -853,11 +853,11 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSWD_UTIL_SRC} ${PASSCHANGE_SRC}
+SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
-PDBEDIT_SRC = '''utils/pdbedit.c ${PASSWD_UTIL_SRC}
+PDBEDIT_SRC = '''utils/pdbedit.c
${LIBCLI_LDAP_NDR_SRC}'''
SMBGET_SRC = '''utils/smbget.c'''
@@ -939,7 +939,7 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
lib/netapi/shutdown.c
lib/netapi/netlogon.c'''
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
+LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
${LIBSMBCONF_SRC}
${REG_SMBCONF_SRC}
${DCUTIL_SRC} ${PRIVILEGES_BASIC_SRC}
@@ -972,7 +972,7 @@ SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
-LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
+LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c'
LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
@@ -994,7 +994,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_rpc_service.c utils/net_rpc_registry.c utils/net_usershare.c
utils/netlookup.c utils/net_sam.c utils/net_rpc_shell.c
utils/net_util.c utils/net_rpc_sh_acct.c utils/net_rpc_audit.c
- ${PASSWD_UTIL_SRC} utils/net_dns.c utils/net_ads_gpo.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
@@ -1028,7 +1028,6 @@ NET_SRC = '''${NET_SRC1}
${NET_SRC2}
${DCUTIL_SRC}
${LIBGPO_SRC} ${DISPLAY_SEC_SRC}
- ${LIBNET_SRC} ${LIBNET_DSSYNC_SRC} ${LIBNET_SAMSYNC_SRC}
${LIB_EVENTLOG_SRC} ${REGFIO_SRC}'''
CUPS_SRC = '''client/smbspool.c'''
@@ -1322,7 +1321,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
- VFS_DEFAULT RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE''',
+ VFS_DEFAULT RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET''',
vars=locals())
bld.SAMBA_SUBSYSTEM('RPC_MODULES',
@@ -1345,6 +1344,25 @@ bld.SAMBA_SUBSYSTEM('READLINE',
source=READLINE_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
+ source=PASSWD_UTIL_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNET',
+ source=LIBNET_SRC,
+ deps='NDR_LIBNET_JOIN',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNET_DSSYNC',
+ source=LIBNET_DSSYNC_SRC,
+ deps='LIBNET',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC',
+ source=LIBNET_SAMSYNC_SRC,
+ deps='LIBNET',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('LIBNDR',
source=LIBNDR_SRC,
vars=locals())
@@ -1441,7 +1459,8 @@ bld.SAMBA_BINARY('net',
source=NET_SRC,
deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
- LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE''',
+ LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE PASSWD_UTIL LIBNET
+ LIBNET_DSSYNC LIBNET_SAMSYNC''',
vars=locals())
bld.SAMBA_BINARY('profiles',
@@ -1488,13 +1507,14 @@ bld.SAMBA_BINARY('smbtree',
bld.SAMBA_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
- LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC''',
+ LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL''',
vars=locals())
bld.SAMBA_BINARY('pdbedit',
source=PDBEDIT_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD
- LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB''',
+ LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB
+ PASSWD_UTIL''',
vars=locals())
bld.SAMBA_BINARY('smbget',
--
Samba Shared Repository
More information about the samba-cvs
mailing list