Correctly setup the conn->share_access based on the current user token.

[kai/samba.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index 4b9c3ec6b4dc4eca90ef3bd64ec76c5629ac9c1d..107587d0bc553847f9ba8f31e95362712470a386 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -209,6 +209,7 @@ PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
+                lib/util_sid_passdb.c
                 lib/util_unixsids.c passdb/lookup_sid.c
                 passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}
@@ -265,10 +266,9 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/wb_lookupsid.c
                    winbindd/wb_lookupsids.c
                    winbindd/wb_lookupname.c
-                   winbindd/wb_sid2uid.c
-                   winbindd/wb_sid2gid.c
                    winbindd/wb_uid2sid.c
                    winbindd/wb_gid2sid.c
+                   winbindd/wb_sids2xids.c
                    winbindd/wb_queryuser.c
                    winbindd/wb_lookupuseraliases.c
                    winbindd/wb_lookupusergroups.c
@@ -557,17 +557,14 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 lib/tevent_barrier.c
                 torture/test_dbwrap_watch.c
                 torture/test_idmap_tdb_common.c
+                torture/test_dbwrap_ctdb.c
                 torture/t_strappend.c'''
 
 SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
         torture/wbc_async.c'''
 
-MASKTEST_SRC = '''torture/masktest.c'''
-
 MSGTEST_SRC = '''torture/msgtest.c'''
 
-LOCKTEST_SRC = '''torture/locktest.c'''
-
 PDBTEST_SRC = '''torture/pdbtest.c'''
 
 VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
@@ -659,6 +656,7 @@ bld.SAMBA3_LIBRARY('nss_wins',
                   source=WINBIND_WINS_NSS_SRC,
                   deps='''param libsmb LIBTSOCKET''',
                   realname='libnss_wins.so.2',
+                  soname='libnss_wins.so',
                   vnum='2')
 
 bld.SAMBA3_LIBRARY('gse',
@@ -979,7 +977,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                     ccan-hash
                     NDR_SMB_ACL
                     netapi
-                    ''',
+                    ''' + bld.env['dmapi_lib'],
                     private_library=True,
                     vars=locals())
 
@@ -1441,6 +1439,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                 NDR_OPEN_FILES
                 idmap
                  ''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbconftort',
@@ -1449,6 +1448,7 @@ bld.SAMBA3_BINARY('smbconftort',
                  talloc
                  param
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('replacetort',
@@ -1456,19 +1456,12 @@ bld.SAMBA3_BINARY('replacetort',
                  deps='replace replace-test',
                  install=False)
 
-bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
-                 source=MASKTEST_SRC,
-                 deps='''
-                 talloc
-                 param
-                 libsmb''',
-                 vars=locals())
-
 bld.SAMBA3_BINARY('msgtest',
                  source=MSGTEST_SRC,
                  deps='''
                  talloc
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbcacls',
@@ -1506,15 +1499,6 @@ bld.SAMBA3_BINARY('sharesec',
                  popt_samba3''',
                  vars=locals())
 
-bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
-                 source=LOCKTEST_SRC,
-                 deps='''
-                 talloc
-                 param
-                 libsmb
-                 LOCKING''',
-                 vars=locals())
-
 bld.SAMBA3_BINARY('pdbtest',
                  source=PDBTEST_SRC,
                  deps='''
@@ -1523,6 +1507,7 @@ bld.SAMBA3_BINARY('pdbtest',
                  popt_samba3
                  AUTH_COMMON
                  auth''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('vfstest',
@@ -1531,11 +1516,13 @@ bld.SAMBA3_BINARY('vfstest',
                  vfs
                  popt_samba3
                  SMBREADLINE''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('log2pcap',
                  source=LOG2PCAP_SRC,
                  deps='''talloc popt''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('locktest2',
@@ -1545,11 +1532,13 @@ bld.SAMBA3_BINARY('locktest2',
                  param
                  libsmb
                  LOCKING''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('debug2html',
                  source=DEBUG2HTML_SRC,
                  deps='''talloc popt''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbfilter',
@@ -1558,6 +1547,7 @@ bld.SAMBA3_BINARY('smbfilter',
                  talloc
                  param
                  LIBNMB''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('versiontest',
@@ -1565,9 +1555,10 @@ bld.SAMBA3_BINARY('versiontest',
                  deps='''
                  SAMBA_VERSION
                  param''',
+                 install=False,
                  vars=locals())
 
-bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
+bld.SAMBA3_BINARY('ntlm_auth',
                  source=NTLM_AUTH_SRC,
                  deps='''
                  talloc
@@ -1580,6 +1571,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('rpc_open_tcp',
@@ -1587,6 +1579,7 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
                  deps='''
                  talloc
                  msrpc3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('test_lp_load',
@@ -1595,6 +1588,7 @@ bld.SAMBA3_BINARY('test_lp_load',
                  talloc
                  param
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('dbwrap_tool',
@@ -1609,6 +1603,7 @@ bld.SAMBA3_BINARY('dbwrap_torture',
                  deps='''
                  talloc
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('split_tokens',
@@ -1616,6 +1611,7 @@ bld.SAMBA3_BINARY('split_tokens',
                  deps='''
                  talloc
                  popt_samba3''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_BINARY('vlp',
@@ -1623,6 +1619,7 @@ bld.SAMBA3_BINARY('vlp',
                  deps='''
                  talloc
                  param''',
+                 install=False,
                  vars=locals())
 
 bld.SAMBA3_PYTHON('pysmbd',
@@ -1639,7 +1636,10 @@ bld.SAMBA3_PYTHON('pylibsmb',
 
 swat_dir = os.path.join(bld.curdir, '../swat')
 swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
+swat_msg_dir = os.path.join(bld.curdir, 'po')
+swat_msg_files = recursive_dirlist(swat_msg_dir, swat_msg_dir, '*.msg')
 bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
+bld.INSTALL_FILES('${CODEPAGEDIR}', swat_msg_files, base_name='po')
 
 ########################## INCLUDES #################################