[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Oct 5 04:51:02 MDT 2010
The branch, master has been updated
via 4aa8aaa s3-waf: convert NSS_INFO into a subsystem.
via d10a601 s3-waf: add RPCCLI_WINREG subsystem.
from ea08cd2 s3: Stop using the write cache after an oplock break
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4aa8aaa6d2f114d4b9a4ab7d9314e9ec01ea3a69
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 5 11:38:45 2010 +0200
s3-waf: convert NSS_INFO into a subsystem.
We don't do the fancy symlinking to idmap modules though.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Oct 5 10:50:53 UTC 2010 on sn-devel-104
commit d10a601ce0a9f1d66344c6c3b8cbb30c467b18a9
Author: Günther Deschner <gd at samba.org>
Date: Mon Sep 27 07:30:41 2010 +0200
s3-waf: add RPCCLI_WINREG subsystem.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/wscript_build | 49 ++++++++++++++++++++++++++++++++++++++++
source3/wscript_build | 31 +++++++++---------------
2 files changed, 61 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 5a9aa2a..db7d5e0 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -87,3 +87,52 @@ bld.SAMBA_MODULE('IDMAP_ADEX',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
+
+NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
+NSS_INFO_SRC = 'nss_info.c'
+
+bld.SAMBA_SUBSYSTEM('NSS_INFO',
+ source=NSS_INFO_SRC,
+ vars=locals())
+
+bld.SAMBA_MODULE('NSS_INFO_TEMPLATE',
+ subsystem='NSS_INFO',
+ source=NSS_INFO_TEMPLATE_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('NSS_INFO_TEMPLATE'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('NSS_INFO_TEMPLATE'))
+
+bld.SAMBA_MODULE('NSS_INFO_ADEX',
+ subsystem='NSS_INFO',
+ source=IDMAP_ADEX_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
+
+bld.SAMBA_MODULE('NSS_INFO_HASH',
+ subsystem='NSS_INFO',
+ source=IDMAP_HASH_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
+
+bld.SAMBA_MODULE('NSS_INFO_RFC2307',
+ subsystem='NSS_INFO',
+ source=IDMAP_AD_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+
+bld.SAMBA_MODULE('NSS_INFO_SFU20',
+ subsystem='NSS_INFO',
+ source=IDMAP_AD_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+
+bld.SAMBA_MODULE('NSS_INFO_SFU',
+ subsystem='NSS_INFO',
+ source=IDMAP_AD_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
diff --git a/source3/wscript_build b/source3/wscript_build
index f724729..b5f277a 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -72,10 +72,6 @@ LIBCLI_EVENTLOG_SRC = '''
../librpc/gen_ndr/cli_eventlog.c
../librpc/gen_ndr/ndr_eventlog_c.c'''
-LIBCLI_WINREG_SRC = '''
- ../librpc/gen_ndr/cli_winreg.c
- ../librpc/gen_ndr/ndr_winreg_c.c'''
-
LIBCLI_NTSVCS_SRC = '''
../librpc/gen_ndr/cli_ntsvcs.c
../librpc/gen_ndr/ndr_ntsvcs_c.c'''
@@ -485,11 +481,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
-#FIXME: set NSS_INFO_STATIC during configuration
-NSS_INFO_STATIC = ''
-NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
-NSS_INFO_SRC = 'winbindd/nss_info.c'
-
WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_group.c
winbindd/winbindd_util.c
@@ -584,7 +575,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${NSS_INFO_SRC}
${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
${TDB_VALIDATE_SRC}
${LIBCLI_DSSETUP_SRC}
@@ -650,7 +640,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${BUILDOPT_SRC}
${LIBSMBCONF_SRC}
${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_WINREG_SRC}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
@@ -745,7 +734,6 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
- ${LIBCLI_WINREG_SRC}
${LIBCLI_NETLOGON_SRC}
${RPC_CLIENT_SCHANNEL_SRC}
rpc_client/init_netlogon.c
@@ -859,7 +847,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_eventlog.c
utils/net_printing.c
${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_WINREG_SRC}
${LIBCLI_DRSUAPI_SRC}
${LIBCLI_INITSHUTDOWN_SRC}
${LIBCLI_DSSETUP_SRC}
@@ -1003,6 +990,7 @@ for prefix in bld.env.MODULE_PREFIXES:
if prefix == 'perfcount': continue
if prefix == 'gpext': continue
if prefix == 'vfs': continue
+ if prefix == 'nss_info': continue
static_key = "%s_STATIC" % prefix.upper()
shared_key = "%s_SHARED" % prefix.upper()
@@ -1196,7 +1184,8 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG
- REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER''',
+ REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER
+ RPCCLI_WINREG''',
vars=locals())
if not bld.env.developer:
@@ -1282,7 +1271,7 @@ bld.SAMBA_SUBSYSTEM('LIBNDR',
#FIXME
bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
- source=LIBNDR_SRC,
+ source='',
vars=locals())
#FIXME
@@ -1313,6 +1302,10 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
source='../libcli/ndr_netlogon.c',
public_deps='LIBNDR NDR_SECURITY')
+bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
+ source='../librpc/gen_ndr/cli_winreg.c',
+ public_deps='RPC_NDR_WINREG')
+
########################## BINARIES #################################
bld.SAMBA_BINARY('smbd/smbd',
@@ -1334,8 +1327,8 @@ bld.SAMBA_BINARY('winbindd/winbindd',
deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
- NSS_INFO_TEMPLATE SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
- LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP
+ SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+ LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP NSS_INFO
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1354,7 +1347,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
- LIBADS SMBREADLINE DISPLAY_SEC DCUTIL''',
+ LIBADS SMBREADLINE DISPLAY_SEC DCUTIL RPCCLI_WINREG''',
vars=locals())
bld.SAMBA_BINARY('smbclient',
@@ -1370,7 +1363,7 @@ bld.SAMBA_BINARY('net',
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC DCUTIL
- REGFIO NDR_NTPRINTING''',
+ REGFIO NDR_NTPRINTING RPCCLI_WINREG''',
vars=locals())
bld.SAMBA_BINARY('profiles',
--
Samba Shared Repository
More information about the samba-cvs
mailing list