sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

s4: Rename NSS_WRAPPER to nss_wrapper.

Browse Source 
Only link to nss_wrapper when it is enabled.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Oct 23 23:05:44 UTC 2010 on sn-devel-104
This commit is contained in:
Jelmer Vernooij
2010-10-23 15:19:49 -07:00
parent 9757a0c54c
commit 2933fac7c7
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/nss_wrapper/wscript
View File

@ -3,14 +3,15 @@
import Options
def set_options(opt):
gr = opt.option_group('developer options')
gr.add_option('--enable-nss-wrapper',
help=("Turn on nss wrapper library (default=no)"),
action="store_true", dest='enable_nss_wrapper', default=False)
gr = opt.option_group('developer options')
gr.add_option('--enable-nss-wrapper',
help=("Turn on nss wrapper library (default=no)"),
action="store_true", dest='enable_nss_wrapper', default=False)
def configure(conf):
if (Options.options.enable_nss_wrapper or
Options.options.developer or
Options.options.enable_selftest):
Options.options.developer or
Options.options.enable_selftest):
conf.DEFINE('NSS_WRAPPER', 1)
conf.ADD_GLOBAL_DEPENDENCY('nss_wrapper')

2
lib/nss_wrapper/wscript_build
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('NSS_WRAPPER',
bld.SAMBA_LIBRARY('nss_wrapper',
source='nss_wrapper.c',
deps='replace',
private_library=True

2
nsswitch/wscript_build
View File

@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('LIBWINBIND-CLIENT',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG'
)

16
source3/wscript_build
View File

@ -1049,7 +1049,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY charset NDR_MESSAGING',
deps='iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY charset NDR_MESSAGING',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@ -1117,7 +1117,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
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 vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
@ -1249,14 +1249,14 @@ bld.SAMBA_BINARY('smbd/smbd',
bld.SAMBA_BINARY('nmbd/nmbd',
source=NMBD_SRC,
deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
PASSDB PARAM ldap LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
install_path='${SBINDIR}',
vars=locals())
bld.SAMBA_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
deps='''talloc tdb tevent cap dl ZLIB
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
@ -1313,7 +1313,7 @@ bld.SAMBA_BINARY('smbspool',
bld.SAMBA_BINARY('testparm',
source=TESTPARM_SRC,
deps='''talloc tevent ldap cap NSS_WRAPPER
deps='''talloc tevent ldap cap
libwbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
LIBSMB_ERR POPT_SAMBA''',
vars=locals())
@ -1418,7 +1418,7 @@ bld.SAMBA_BINARY('locktest',
bld.SAMBA_BINARY('nsstest',
source=NSSTEST_SRC,
deps='NSS_WRAPPER',
deps='',
vars=locals())
bld.SAMBA_BINARY('pdbtest',
@ -1466,7 +1466,7 @@ bld.SAMBA_BINARY('versiontest',
bld.SAMBA_BINARY('wbinfo',
source=WBINFO_SRC,
deps='''talloc libwbclient tevent cap
NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
vars=locals())
@ -1512,7 +1512,7 @@ bld.SAMBA_BINARY('split_tokens',
bld.SAMBA_BINARY('vlp',
source=VLP_SRC,
deps='''talloc tdb NSS_WRAPPER''',
deps='''talloc tdb''',
vars=locals())
swat_files=recursive_dirlist('../swat', '../swat', '*')

2
source4/auth/ntlm/wscript_build
View File

@ -42,7 +42,7 @@ bld.SAMBA_MODULE('auth_unix',
source='auth_unix.c',
subsystem='auth',
init_function='auth_unix_init',
deps='pam PAM_ERRORS NSS_WRAPPER LIBTSOCKET'
deps='pam PAM_ERRORS LIBTSOCKET'
)

4
source4/dsdb/samdb/ldb_modules/wscript_build
View File

@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
subsystem='ldb',
init_function='LDB_MODULE(samba3sam)',
internal_module=False,
deps='talloc libevents ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY'
)
@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
subsystem='ldb',
init_function='LDB_MODULE(samba3sid)',
internal_module=False,
deps='talloc libevents ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
)

2
source4/dsdb/wscript_build
View File

@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('SAMDB',
source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c',
autoproto='samdb/samdb_proto.h',
public_deps='krb5',
deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS',
deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS',
vnum='0.0.1'
)

2
source4/ntvfs/unixuid/wscript_build
View File

@ -4,6 +4,6 @@ bld.SAMBA_MODULE('ntvfs_unixuid',
source='vfs_unixuid.c',
subsystem='ntvfs',
init_function='ntvfs_unixuid_init',
deps='SAMDB NSS_WRAPPER'
deps='SAMDB'
)

2
source4/rpc_server/wscript_build
View File

@ -60,7 +60,7 @@ bld.SAMBA_MODULE('dcerpc_unixinfo',
source='unixinfo/dcesrv_unixinfo.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_unixinfo_init',
deps='DCERPC_COMMON SAMDB NDR_UNIXINFO NSS_WRAPPER LIBWBCLIENT_OLD'
deps='DCERPC_COMMON SAMDB NDR_UNIXINFO LIBWBCLIENT_OLD'
)

2
source4/torture/local/wscript_build
View File

@ -5,6 +5,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_local_init',
deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB',
deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb SAMDB',
internal_module=True
)