build: Remove duplicate call to bld.SYMBOL_CHECK()

[nivanova/samba-autobuild/.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index b87b4d1fd646d34211ba84c555313a5c3c0ff8a6..f1d41c68a8329ca07821bed95f1433d305b00537 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
@@ -370,6 +370,10 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/smb2_write.c
                smbd/smb2_lock.c
                smbd/smb2_ioctl.c
+               smbd/smb2_ioctl_dfs.c
+               smbd/smb2_ioctl_filesys.c
+               smbd/smb2_ioctl_named_pipe.c
+               smbd/smb2_ioctl_network_fs.c
                smbd/smb2_keepalive.c
                smbd/smb2_find.c
                smbd/smb2_notify.c
@@ -382,6 +386,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/smbXsrv_open.c
                smbd/server_exit.c
                smbd/durable.c
+               smbd/scavenger.c
                ${MANGLE_SRC}'''
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
@@ -416,11 +421,6 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
 
 NMBD_SRC = '${NMBD_SRC1}'
 
-SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
-               web/swat.c web/neg_lang.c'''
-
-SWAT_SRC = '''${SWAT_SRC1}'''
-
 STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
 
 SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -557,6 +557,7 @@ 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}
@@ -716,6 +717,7 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info',
                      '!get_attr_list']
 private_pdb_match.append('!pdb_nds_*')
 private_pdb_match.append('!pdb_init_ldapsam')
+private_pdb_match.append('!pdb_ldapsam_init*')
 private_pdb_match = private_pdb_match + ldapsam_pdb_match
 
 private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
@@ -730,7 +732,7 @@ bld.SAMBA3_LIBRARY('pdb',
                                include/passdb.h
                                passdb/machine_sid.h
                                passdb/lookup_sid.h''',
-                   abi_match=private_pdb_match + ['*'],
+                   abi_match=private_pdb_match,
                    abi_directory='passdb/ABI',
                    vnum='0',
                    vars=locals())
@@ -976,6 +978,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                     ccan-hash
                     NDR_SMB_ACL
                     netapi
+                   NDR_IOCTL
                     ''' + bld.env['dmapi_lib'],
                     private_library=True,
                     vars=locals())
@@ -1213,27 +1216,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  install_path='${SBINDIR}',
                  vars=locals())
 
-bld.SAMBA3_BINARY('web/swat',
-                 source=SWAT_SRC,
-                 deps='''
-                 talloc
-                 tevent
-                 samba3core
-                 libsmb
-                 param
-                 pdb
-                 popt_samba3
-                 smbd_base
-                 LOCKING
-                 PLAINTEXT_AUTH
-                 PASSCHANGE
-                 PRINTBASE
-                 PRINTING
-                 ''',
-                 enabled=bld.env.build_swat,
-                 install_path='${SBINDIR}',
-                 vars=locals())
-
 bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,
                  deps='''
@@ -1633,9 +1615,14 @@ bld.SAMBA3_PYTHON('pylibsmb',
                   realname='samba/samba3/libsmb_samba_internal.so'
                   )
 
-swat_dir = os.path.join(bld.curdir, '../swat')
-swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
-bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
+bld.SAMBA3_BINARY('regedit',
+                  source="""utils/regedit.c utils/regedit_samba3.c
+                            utils/regedit_wrap.c utils/regedit_treeview.c
+                            utils/regedit_valuelist.c utils/regedit_dialog.c
+                            utils/regedit_hexedit.c""",
+                  deps='ncurses menu panel form registry param popt_samba3 smbregistry',
+                  enabled=bld.env.build_regedit,
+                  vars=locals())
 
 ########################## INCLUDES #################################
 
@@ -1661,4 +1648,3 @@ bld.RECURSE('lib/netapi/examples')
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()
 
-bld.SYMBOL_CHECK()