lib: Remove poll_funcs

[samba.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index a14551f0577325a8181a2fdc02217b7920c71d4e..66fcaac1b67d79b8a2abb374ad0aaa88539c5990 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -96,6 +96,7 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
 bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source='''lib/tldap.c
                     lib/tldap_util.c
+                    lib/tldap_gensec_bind.c
                     ''',
                     deps='asn1util LIBTSOCKET samba3util')
 
@@ -245,7 +246,7 @@ bld.SAMBA3_LIBRARY('util_cmdline',
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
                      source='libads/kerberos.c libads/ads_status.c',
-                     public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
+                     public_deps='krb5samba asn1util k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source='''lib/system.c
@@ -261,6 +262,7 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                    lib/util_sock.c
                    lib/util_tsock.c
                    lib/util_transfer_file.c
+                   lib/sys_popen.c
                    lib/sock_exec.c''',
                    deps='ndr LIBTSOCKET samba-security NDR_SECURITY samba-util util_tdb sys_rw iov_buf')
 
@@ -300,8 +302,7 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
 
 bld.SAMBA3_LIBRARY('messages_dgm',
                    source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
-                   deps='''talloc UNIX_MSG POLL_FUNCS_TEVENT samba-debug
-                           genrand''',
+                   deps='''talloc samba-debug PTHREADPOOL msghdr genrand''',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('messages_util',
@@ -315,6 +316,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/id_cache.c
                    lib/talloc_dict.c
                    lib/serverid.c
+                   lib/server_id_watch.c
                    lib/server_id_db_util.c
                    lib/addrchange.c
                    ../lib/util/debug_s3.c
@@ -330,7 +332,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/dmallocmsg.c
                    intl/lang_tdb.c
                    lib/gencache.c
-                   lib/events.c
+                   lib/util_event.c
                    lib/server_contexts.c
                    lib/server_prefork.c
                    lib/server_prefork_util.c
@@ -342,7 +344,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/tevent_wait.c
                    lib/idmap_cache.c
                    lib/util_ea.c
-                   lib/background.c''',
+                   lib/background.c
+                   lib/cleanupdb.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -351,8 +354,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         UTIL_PW
                         SAMBA_VERSION
                         PTHREADPOOL
-                        UNIX_MSG
-                        POLL_FUNCS_TEVENT
                         interfaces
                         param
                         dbwrap
@@ -369,14 +370,9 @@ bld.SAMBA3_LIBRARY('smbd_shim',
                   deps='talloc',
                    private_library=True)
 
-bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
-                    source='''libsmb/ntlmssp.c
-                    libsmb/ntlmssp_wrap.c''',
-                    deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient')
-
 bld.SAMBA3_SUBSYSTEM('auth_generic',
                     source='libsmb/auth_generic.c',
-                    deps='LIBNTLMSSP gse gensec')
+                    deps='gse gensec')
 
 bld.SAMBA3_LIBRARY('libsmb',
                    source='''libsmb/clientgen.c
@@ -404,7 +400,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                    libsmb/smbsock_connect.c
                    libsmb/cli_smb2_fnum.c''',
                    deps='''
-                   LIBNTLMSSP
                    auth_generic
                    CLDAP
                    LIBNMB
@@ -631,7 +626,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    RPC_SERVICE
                    NDR_SMBXSRV
                    LEASES_DB
-                   LIBASYS
                    sysquotas
                    NDR_SMB_ACL
                    netapi
@@ -639,6 +633,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    notifyd
                    ''' +
                    bld.env['dmapi_lib'] +
+                   bld.env['legacy_quota_libs'] +
                    NOTIFY_DEPS,
                    private_library=True)
 
@@ -786,11 +781,6 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     source='lib/util_tdb.c',
                     deps='talloc samba3-util')
 
-bld.SAMBA3_LIBRARY('msghdr',
-                   source='lib/msghdr.c',
-                   deps='replace iov_buf',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('samba3-util',
                    source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/namearray.c lib/file_id.c''',
                    deps='samba-util charset',
@@ -924,8 +914,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/wb_lookupsid.c
                  winbindd/wb_lookupsids.c
                  winbindd/wb_lookupname.c
-                 winbindd/wb_uid2sid.c
-                 winbindd/wb_gid2sid.c
                  winbindd/wb_sids2xids.c
                  winbindd/wb_xids2sids.c
                  winbindd/wb_queryuser.c
@@ -946,10 +934,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  winbindd/winbindd_lookupsid.c
                  winbindd/winbindd_lookupsids.c
                  winbindd/winbindd_lookupname.c
-                 winbindd/winbindd_sid_to_uid.c
-                 winbindd/winbindd_sid_to_gid.c
-                 winbindd/winbindd_uid_to_sid.c
-                 winbindd/winbindd_gid_to_sid.c
                  winbindd/winbindd_sids_to_xids.c
                  winbindd/winbindd_xids_to_sids.c
                  winbindd/winbindd_allocate_uid.c
@@ -1011,58 +995,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}')
 
-bld.SAMBA3_BINARY('rpcclient/rpcclient',
-                 source='''rpcclient/rpcclient.c
-                 rpcclient/cmd_lsarpc.c
-                 rpcclient/cmd_samr.c
-                 rpcclient/cmd_spoolss.c
-                 rpcclient/cmd_netlogon.c
-                 rpcclient/cmd_srvsvc.c
-                 rpcclient/cmd_dfs.c
-                 rpcclient/cmd_epmapper.c
-                 rpcclient/cmd_dssetup.c
-                 rpcclient/cmd_echo.c
-                 rpcclient/cmd_shutdown.c
-                 rpcclient/cmd_test.c
-                 rpcclient/cmd_wkssvc.c
-                 rpcclient/cmd_ntsvcs.c
-                 rpcclient/cmd_drsuapi.c
-                 rpcclient/cmd_eventlog.c
-                 rpcclient/cmd_winreg.c
-                 rpcclient/cmd_fss.c
-                 rpcclient/cmd_witness.c
-                 rpcclient/cmd_clusapi.c''',
-                 deps='''
-                 talloc
-                 popt_samba3
-                 pdb
-                 libsmb
-                 param
-                 ndr-standard
-                 msrpc3
-                 SMBREADLINE
-                 trusts_util
-                 RPC_NDR_WINREG
-                 RPC_NDR_ECHO
-                 RPC_CLIENT_SCHANNEL
-                 DCUTIL
-                 LIBCLI_SAMR
-                 libcli_lsa3
-                 libcli_netlogon3
-                 cli_spoolss
-                 RPC_NDR_SRVSVC
-                 RPC_NDR_WKSSVC
-                 RPC_NDR_DSSETUP
-                 RPC_NDR_DFS
-                 RPC_NDR_DRSUAPI
-                 RPC_NDR_NTSVCS
-                 RPC_NDR_EVENTLOG
-                 INIT_SAMR
-                 RPC_NDR_FSRVP
-                 RPC_NDR_WITNESS
-                 RPC_NDR_CLUSAPI
-                 ''')
-
 bld.SAMBA3_BINARY('client/smbclient',
                  source='''client/client.c
                  client/clitar.c
@@ -1300,7 +1232,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  torture/test_messaging_read.c
                  torture/test_messaging_fd_passing.c
                  torture/test_oplock_cancel.c
-                 torture/t_strappend.c
+                 torture/test_pthreadpool_tevent.c
                  torture/bench_pthreadpool.c
                  torture/wbc_async.c''',
                  deps='''
@@ -1449,7 +1381,7 @@ bld.SAMBA3_BINARY('ntlm_auth',
                  tiniparser
                  libsmb
                  popt_samba3
-                 LIBNTLMSSP gse gensec''')
+                 gse gensec''')
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
@@ -1491,13 +1423,13 @@ bld.SAMBA3_BINARY('vlp',
 
 bld.SAMBA3_PYTHON('pysmbd',
                   source='smbd/pysmbd.c',
-                  deps='smbd_base pyrpc_util',
+                  deps='smbd_base pyrpc_util pytalloc-util',
                   realname='samba/samba3/smbd.so'
                   )
 
 bld.SAMBA3_PYTHON('pylibsmb',
                   source='libsmb/pylibsmb.c',
-                  deps='smbclient samba-credentials pytalloc-util',
+                  deps='smbclient samba-credentials pycredentials',
                   realname='samba/samba3/libsmb_samba_internal.so'
                   )
 
@@ -1524,9 +1456,6 @@ bld.SAMBA3_BINARY('spotlight2sparql',
 bld.RECURSE('auth')
 bld.RECURSE('libgpo/gpext')
 bld.RECURSE('lib/pthreadpool')
-bld.RECURSE('lib/asys')
-bld.RECURSE('lib/poll_funcs')
-bld.RECURSE('lib/unix_msg')
 bld.RECURSE('librpc')
 bld.RECURSE('librpc/idl')
 bld.RECURSE('libsmb')
@@ -1543,6 +1472,7 @@ bld.RECURSE('../examples/VFS')
 bld.RECURSE('lib/netapi/tests')
 bld.RECURSE('lib/netapi/examples')
 bld.RECURSE('smbd/notifyd')
+bld.RECURSE('rpcclient')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()