smbd: Remove source3/smbd/statcache.c
[samba.git] / source3 / wscript_build
index 7d44e843c49d6721143811300a07166f1bc2145b..e59ea573840c74fdb53947949a1c9dc8dca04de5 100644 (file)
@@ -27,9 +27,9 @@ bld.SAMBA3_LIBRARY('netapi',
                     lib/netapi/file.c
                     lib/netapi/shutdown.c
                     lib/netapi/netlogon.c''',
+                    deps='CREDENTIALS_CMDLINE',
                     public_deps='''
                     talloc
-                    util_cmdline
                     msrpc3
                     ads
                     NDR_LIBNETAPI
@@ -42,7 +42,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     ''',
                     public_headers='../source3/lib/netapi/netapi.h',
                     pc_files='libnet/netapi.pc',
-                    vnum='0')
+                    vnum='1.0.0')
 
 bld.SAMBA3_LIBRARY('gse',
                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
@@ -55,6 +55,7 @@ bld.SAMBA3_LIBRARY('msrpc3',
                           rpc_client/rpc_transport_np.c
                           rpc_client/rpc_transport_sock.c
                           rpc_client/rpc_transport_tstream.c
+                          rpc_client/local_np.c
                           librpc/rpc/dcerpc_helpers.c
                           ''',
                    deps='''
@@ -65,6 +66,7 @@ bld.SAMBA3_LIBRARY('msrpc3',
                         COMMON_SCHANNEL
                         LIBCLI_AUTH
                         LIBTSOCKET
+                        npa_tstream
                         gse
                         dcerpc-binding
                         libsmb
@@ -112,7 +114,7 @@ bld.SAMBA3_BINARY('test_tldap',
                        smbconf
                        cmocka
                        ''',
-                  install=False)
+                  for_selftest=True)
 
 # libpdb.so should not expose internal symbols that are only usable
 # to the statically linked modules that are merged into libpdb.
@@ -177,6 +179,7 @@ bld.SAMBA3_SUBSYSTEM('pdb',
                         LIBCLI_AUTH
                         flag_mapping
                         samba-credentials
+                        samba-modules
                         nscd
                         ''')
 
@@ -207,7 +210,7 @@ bld.SAMBA_BINARY('test_registry_regfio',
                  source='registry/tests/test_regfio.c',
                  deps='cmocka samba3-util smbconf REGFIO',
                  local_include=False,
-                 install=False)
+                 for_selftest=True)
 
 # Do not link against this use 'smbconf'
 bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
@@ -220,6 +223,7 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
                           lib/util_nttoken.c
                           registry/reg_backend_db.c
                           registry/reg_parse_internal.c
+                          registry/reg_parse.c
                           lib/srprs.c
                           registry/reg_init_basic.c
                           ''',
@@ -248,7 +252,7 @@ bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
                            ''',
                     deps='SMBREGISTRY')
 
-bld.SAMBA3_SUBSYSTEM('REG_FULL',
+bld.SAMBA3_LIBRARY('REG_FULL',private_library=True,
                     source='''
                            registry/reg_backend_printing.c
                            registry/reg_backend_shares.c
@@ -263,23 +267,10 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
                     deps='''
                          smbconf
                          tdb-wrap3
+                         REG_PARSE_PRS
+                         pdb
                          ''')
 
-bld.SAMBA3_LIBRARY('popt_samba3',
-                   source='lib/popt_common.c',
-                   deps='popt samba-util smbconf',
-                   private_library=True)
-
-bld.SAMBA3_LIBRARY('popt_samba3_cmdline',
-                   source='lib/popt_common_cmdline.c',
-                   deps='popt_samba3 util_cmdline cmdline_contexts',
-                   private_library=True)
-
-bld.SAMBA3_LIBRARY('util_cmdline',
-                   source='lib/util_cmdline.c',
-                   deps='secrets3',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('cmdline_contexts',
                    source='lib/cmdline_contexts.c',
                    deps='samba3core',
@@ -300,6 +291,7 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                           lib/util_file.c
                           lib/util.c
                           lib/util_path.c
+                          lib/util_matching.c
                           lib/util_procid.c
                           lib/util_sock.c
                           lib/util_tsock.c
@@ -358,21 +350,6 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
                           samba-cluster-support
                           ''')
 
-bld.SAMBA3_LIBRARY('messages_dgm',
-                   source='''
-                          lib/messages_dgm.c
-                          lib/messages_dgm_ref.c
-                          ''',
-                   deps='''
-                        talloc
-                        samba-debug
-                        PTHREADPOOL
-                        msghdr
-                        genrand
-                       samba-util
-                        ''',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('messages_util',
                    source='''lib/messages_util.c''',
                    deps='samba-util',
@@ -401,13 +378,9 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                           lib/gencache.c
                           lib/util_event.c
                           lib/global_contexts.c
-                          lib/server_prefork.c
-                          lib/server_prefork_util.c
                           lib/ldap_escape.c
-                          libads/krb5_errs.c
                           lib/system_smbd.c
                           lib/audit.c
-                          lib/tevent_wait.c
                           lib/idmap_cache.c
                           lib/namemap_cache.c
                           lib/util_ea.c
@@ -432,6 +405,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         talloc_report_printf
                         access
                         TDB_LIB
+                        z
                         ''')
 
 bld.SAMBA3_LIBRARY('smbd_shim',
@@ -457,15 +431,11 @@ bld.SAMBA3_LIBRARY('libsmb',
                           libsmb/cliprint.c
                           libsmb/clitrans.c
                           libsmb/clisecdesc.c
-                          libsmb/clidgram.c
-                          libsmb/clistr.c
                           libsmb/cliquota.c
                           libsmb/clifsinfo.c
                           libsmb/clidfs.c
                           libsmb/clioplock.c
-                          libsmb/clirap2.c
                           libsmb/async_smb.c
-                          libsmb/reparse_symlink.c
                           libsmb/clisymlink.c
                           libsmb/smbsock_connect.c
                           libsmb/cli_smb2_fnum.c
@@ -480,7 +450,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                         NDR_IOCTL
                        NDR_QUOTA
                         cli_smb_common
-                        util_cmdline
                         tevent
                         ''',
                    private_library=True)
@@ -504,6 +473,9 @@ bld.SAMBA3_LIBRARY('secrets3',
                         smbconf
                         samba3util
                         dbwrap
+                        krb5samba
+                        LIBCLI_AUTH
+                        samba-credentials
                         ''',
                    private_library=True)
 
@@ -515,7 +487,7 @@ bld.SAMBA3_LIBRARY('smbldap',
                     abi_directory='lib/ABI',
                     abi_match='smbldap_*',
                     pc_files=[],
-                    vnum='2',
+                    vnum='2.1.0',
                     public_headers='include/smbldap.h include/smb_ldap.h')
 
 bld.SAMBA3_LIBRARY('ads',
@@ -538,6 +510,7 @@ bld.SAMBA3_LIBRARY('ads',
                    deps='''
                         cli-ldap-common
                         krb5samba
+                        krb5
                         ldap
                         lber
                         KRBCLIENT
@@ -590,8 +563,7 @@ bld.SAMBA3_LIBRARY('smbconf',
                         SAMBA_VERSION
                         cap
                         charset
-                        cli_smb_common
-                        errors3
+                        samba-hostconfig
                         SMBCONF_PARAM
                         samba-util
                         talloc
@@ -599,12 +571,7 @@ bld.SAMBA3_LIBRARY('smbconf',
                         ''',
                    public_headers='../lib/smbconf/smbconf.h',
                    pc_files=[],
-                   vnum='0')
-
-bld.SAMBA3_LIBRARY('smbd_conn',
-                   source='smbd/conn.c',
-                   deps='samba3-util samba-util',
-                   private_library=True)
+                   vnum='0.0.1')
 
 bld.SAMBA3_SUBSYSTEM('sysquotas',
                      source='''
@@ -629,6 +596,27 @@ if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
     NOTIFY_SOURCES += ' smbd/notify_fam.c'
     NOTIFY_DEPS += ' ' + bld.CONFIG_GET('SAMBA_FAM_LIBS')
 
+if bld.CONFIG_SET('WITH_SMB1SERVER'):
+    SMB1_SOURCES = '''
+                   smbd/smb1_message.c
+                   smbd/smb1_sesssetup.c
+                   smbd/smb1_lanman.c
+                   smbd/smb1_utils.c
+                   smbd/smb1_aio.c
+                   smbd/smb1_ipc.c
+                   smbd/smb1_negprot.c
+                   smbd/smb1_nttrans.c
+                   smbd/smb1_oplock.c
+                   smbd/smb1_pipes.c
+                   smbd/smb1_reply.c
+                   smbd/smb1_service.c
+                   smbd/smb1_signing.c
+                   smbd/smb1_process.c
+                   smbd/smb1_trans2.c
+    '''
+else:
+    SMB1_SOURCES = ''
+
 bld.SAMBA3_LIBRARY('smbd_base',
                    source='''
                           smbd/server_reload.c
@@ -643,15 +631,11 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/conn_idle.c
                           smbd/share_access.c
                           smbd/fileio.c
-                          smbd/ipc.c
-                          smbd/lanman.c
-                          smbd/negprot.c
-                          smbd/message.c
-                          smbd/nttrans.c
-                          smbd/pipes.c
-                          smbd/reply.c
-                          smbd/sesssetup.c
-                          smbd/trans2.c
+                          smbd/smb2_ipc.c
+                          smbd/smb2_nttrans.c
+                          smbd/smb2_pipes.c
+                          smbd/smb2_reply.c
+                          smbd/smb2_trans2.c
                           smbd/uid.c
                           smbd/dosmode.c
                           smbd/filename.c
@@ -662,23 +646,25 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/srvstr.c
                           smbd/vfs.c
                           smbd/perfcount.c
-                          smbd/statcache.c
                           smbd/seal.c
                           smbd/posix_acls.c
                           lib/sysacls.c
-                          smbd/process.c
-                          smbd/service.c
+                          smbd/smb2_process.c
+                          smbd/smb2_service.c
                           smbd/error.c
                           printing/printspoolss.c
+                          printing/rap_jobid.c
+                          printing/load.c
+                          printing/printer_list.c
                           lib/sessionid_tdb.c
                           lib/cleanupdb.c
                           smbd/fake_file.c
                           smbd/quotas.c
                           smbd/ntquotas.c
                           smbd/msdfs.c
-                          smbd/aio.c smbd/statvfs.c
+                          smbd/smb2_aio.c smbd/statvfs.c
                           smbd/dmapi.c
-                          smbd/signing.c
+                          smbd/smb2_signing.c
                           smbd/file_access.c
                           smbd/dnsregister.c smbd/globals.c
                           smbd/smb2_server.c
@@ -697,12 +683,14 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/smb2_ioctl_filesys.c
                           smbd/smb2_ioctl_named_pipe.c
                           smbd/smb2_ioctl_network_fs.c
+                          smbd/smb2_ioctl_smbtorture.c
                           smbd/smb2_keepalive.c
                           smbd/smb2_query_directory.c
                           smbd/smb2_notify.c
                           smbd/smb2_getinfo.c
                           smbd/smb2_setinfo.c
                           smbd/smb2_break.c
+                          smbd/smb2_posix.c
                           smbd/smbXsrv_version.c
                           smbd/smbXsrv_client.c
                           smbd/smbXsrv_session.c
@@ -714,13 +702,15 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/mangle.c
                           smbd/mangle_hash.c
                           smbd/mangle_hash2.c
-                          smbd/oplock.c
+                          smbd/smb2_oplock.c
                           smbd/oplock_linux.c
                           smbd/notify.c
                           smbd/notify_msg.c
                           smbd/build_options.c
-                          smbd/smb1_utils.c
-                          ''' + NOTIFY_SOURCES,
+                          smbd/conn.c
+                          rpc_server/srv_pipe_hnd.c
+                          rpc_server/rpc_ncacn_np.c
+                          ''' + NOTIFY_SOURCES + SMB1_SOURCES,
                    deps='''
                         talloc
                         tevent
@@ -732,15 +722,12 @@ bld.SAMBA3_LIBRARY('smbd_base',
                         vfs_posixacl
                         inotify
                         samba3core
-                        smbd_conn
                         param_service
                         AVAHI
-                        PRINTBASE
                         PROFILE
                         LOCKING
                         LIBADS_SERVER
                         LIBAFS
-                        RPC_SERVICE
                         NDR_SMBXSRV
                         LEASES_DB
                         LEASES_UTIL
@@ -752,6 +739,8 @@ bld.SAMBA3_LIBRARY('smbd_base',
                         vfs_acl_common
                         NDR_QUOTA
                         GNUTLS_HELPERS
+                        fd_handle
+                        cli_spoolss
                    ''' +
                    bld.env['dmapi_lib'] +
                    bld.env['legacy_quota_libs'] +
@@ -768,10 +757,12 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
                     deps='''
                          tdb
                          talloc
+                         vfs
                          LEASES_DB
                          LEASES_UTIL
                          NDR_OPEN_FILES
                          FNAME_UTIL
+                         fd_handle
                          ''')
 
 bld.SAMBA3_SUBSYSTEM('LEASES_DB',
@@ -785,7 +776,10 @@ bld.SAMBA3_SUBSYSTEM('LEASES_UTIL',
 if bld.CONFIG_GET("WITH_PROFILE"):
     bld.SAMBA3_SUBSYSTEM('PROFILE',
                          source='profile/profile.c',
-                         deps='samba-util')
+                         deps='''
+                              samba-util
+                              gnutls
+                              ''')
 else:
     bld.SAMBA3_SUBSYSTEM('PROFILE',
                          source='profile/profile_dummy.c',
@@ -815,7 +809,6 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
                          LIBADS_PRINTER
                          tdb
                          printing_migrate
-                         SPOOLSSD
                          ''')
 
 bld.SAMBA3_LIBRARY('printing_migrate',
@@ -841,23 +834,35 @@ bld.SAMBA3_SUBSYSTEM('PRINTING',
                            printing/print_cups.c
                            printing/print_generic.c
                            printing/lpq_parse.c
-                           printing/load.c
                            printing/print_standard.c
                            printing/print_iprint.c
-                           printing/printer_list.c
                            ''',
                     deps='''
                          NDR_PRINTCAP
-                         tdb
+                         dbwrap
+                         tdb-wrap3
+                         SMBCONF_PARAM
+                         PRINTBASE
+                         smbd_base
                          cups
                          ''')
 
+bld.SAMBA_BINARY('samba-bgqd',
+                 source='printing/samba-bgqd.c',
+                 deps='''
+                 samba3core
+                 CMDLINE_S3
+                 AUTH_COMMON
+                 RPC_SPOOLSS
+                 ''',
+                 install_path='${LIBEXECDIR}/samba')
+
 bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
                     source='lib/filename_util.c',
                     deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('LIBNET',
-                    source='libnet/libnet_join.c',
+                    source='libnet/libnet_join.c libnet/libnet_join_offline.c',
                     deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb')
 
 bld.SAMBA3_LIBRARY('net_keytab',
@@ -886,12 +891,14 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
                             libsmb/unexpected.c
                             libsmb/namecache.c
                             libsmb/nmblib.c
+                            libsmb/clidgram.c
                             libsmb/namequery.c
                             libsmb/conncache.c
                             libads/sitename_cache.c
                             ''',
                      deps='''
                           LIBTSOCKET
+                          LIBCLI_NETLOGON
                           samba3util
                           addns
                           lmhosts
@@ -915,6 +922,7 @@ bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
                            auth/pass_check.c
                            ''',
                     deps='''
+                         crypt
                          pam
                          PAM_ERRORS
                          ''')
@@ -939,13 +947,22 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE',
                          tdb
                          ''')
 
+bld.SAMBA3_SUBSYSTEM('dsgetdcname',
+                    source='''
+                           libsmb/dsgetdcname.c
+                           ''',
+                    deps='''
+                         CLDAP
+                         LIBNMB
+                         ''')
+
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
                     source='''
                            libsmb/namequery_dc.c
-                           libsmb/dsgetdcname.c
                            ''',
                     deps='''
                          ads
+                         dsgetdcname
                          msrpc3
                          libcli_lsa3
                          ''')
@@ -1036,9 +1053,11 @@ bld.SAMBA3_LIBRARY('cli_spoolss',
                           rpc_client/init_spoolss.c
                           ''',
                    deps='''
-                        RPC_NDR_SPOOLSS
-                        smbconf
-                        secrets3''',
+                   RPC_NDR_SPOOLSS
+                   smbconf
+                   secrets3
+                   gensec
+                   ''',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
@@ -1071,13 +1090,6 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
 bld.SAMBA3_SUBSYSTEM('LIBLSA',
                      source='lib/lsa.c')
 
-bld.SAMBA3_SUBSYSTEM('SPOOLSSD',
-                    source='printing/spoolssd.c',
-                    deps='''
-                         samba-util
-                         RPC_SOCK_HELPER
-                         ''')
-
 bld.SAMBA3_SUBSYSTEM('tevent-glib-glue',
                     source='lib/tevent_glib_glue.c',
                     deps='glib-2.0',
@@ -1088,21 +1100,25 @@ bld.SAMBA3_SUBSYSTEM('ADOUBLE',
                     source='lib/adouble.c',
                     deps='STRING_REPLACE')
 
+bld.SAMBA3_BINARY('test_adouble',
+                 source='lib/test_adouble.c',
+                 deps='smbd_base STRING_REPLACE cmocka',
+                 for_selftest=True)
+
 bld.SAMBA3_SUBSYSTEM('STRING_REPLACE',
                     source='lib/string_replace.c')
 
+bld.SAMBA3_SUBSYSTEM('fd_handle',
+                    source='smbd/fd_handle.c')
+
 ########################## BINARIES #################################
 
 bld.SAMBA3_BINARY('smbd/smbd',
                  source='smbd/server.c smbd/smbd_cleanupd.c',
                  deps='''
-                      popt_samba3
+                      CMDLINE_S3
                       smbd_base
-                      EPMD
-                      LSASD
-                      FSSD
-                      MDSSD
-                      SPOOLSSD
+                      REG_FULL
                       ''',
                  install_path='${SBINDIR}')
 
@@ -1120,7 +1136,7 @@ bld.SAMBA3_BINARY('client/smbclient',
                         ''',
                  deps='''
                       talloc
-                      popt_samba3_cmdline
+                      CMDLINE_S3
                       smbconf
                       ndr-standard
                       SMBREADLINE
@@ -1135,7 +1151,6 @@ bld.SAMBA3_BINARY('smbspool',
                  source='client/smbspool.c',
                  deps='''
                       talloc
-                      popt_samba3
                       smbconf
                       libsmb
                       samba3core
@@ -1151,130 +1166,36 @@ bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
                  install_path='${LIBEXECDIR}/samba',
                  enabled=bld.CONFIG_SET('HAVE_CUPS'))
 
-bld.SAMBA3_BINARY('locktest2',
-                 source='torture/locktest2.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      libsmb
-                      LOCKING
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
-                 source='''
-                        torture/torture.c
-                        torture/nbio.c
-                        torture/scanner.c
-                        torture/utable.c
-                        torture/denytest.c
-                        torture/mangle_test.c
-                        torture/nbench.c
-                        torture/test_async_echo.c
-                        torture/test_addrchange.c
-                        torture/test_posix_append.c
-                        torture/test_nttrans_create.c
-                        torture/test_nttrans_fsctl.c
-                        torture/test_case_insensitive.c
-                        torture/test_notify_online.c
-                        torture/test_chain3.c
-                        torture/test_smb2.c
-                        torture/test_authinfo_structs.c
-                        torture/test_smbsock_any_connect.c
-                        torture/test_cleanup.c
-                        torture/test_notify.c
-                        lib/tevent_barrier.c
-                        torture/test_dbwrap_watch.c
-                        torture/test_dbwrap_do_locked.c
-                        torture/test_idmap_tdb_common.c
-                        torture/test_dbwrap_ctdb.c
-                        torture/test_buffersize.c
-                        torture/test_messaging_read.c
-                        torture/test_messaging_fd_passing.c
-                        torture/test_messaging_send_all.c
-                        torture/test_oplock_cancel.c
-                        torture/test_pthreadpool_tevent.c
-                        torture/bench_pthreadpool.c
-                        torture/wbc_async.c
-                        torture/test_g_lock.c
-                        torture/test_namemap_cache.c
-                        torture/test_idmap_cache.c
-                        torture/test_hidenewfiles.c
-                        ''',
-                 deps='''
-                      talloc
-                      smbconf
-                      libsmb
-                      msrpc3
-                      TLDAP
-                      RPC_NDR_ECHO
-                      WB_REQTRANS
-                      LOCKING
-                      NDR_OPEN_FILES
-                      idmap
-                      IDMAP_TDB_COMMON
-                      samba-cluster-support
-                      ''',
-                 cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
-                 install=False)
+bld.SAMBA3_BINARY('smbspool_argv_wrapper',
+                 source='script/tests/smbspool_argv_wrapper.c',
+                 for_selftest=True)
 
 bld.SAMBA3_BINARY('smbconftort',
                  source='lib/smbconf/testsuite.c',
                  deps='''
                       talloc
                       smbconf
-                      popt_samba3
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('msgtest',
-                 source='torture/msgtest.c',
-                 deps='''
-                      talloc
-                      smbconf
+                      CMDLINE_S3
                       ''',
-                 install=False)
+                 for_selftest=True)
 
-bld.SAMBA3_BINARY('msg_sink',
-                 source='torture/msg_sink.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('msg_source',
-                 source='torture/msg_source.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('pdbtest',
-                 source='torture/pdbtest.c',
-                 deps='''
-                      talloc
-                      pdb
-                      popt_samba3
-                      AUTH_COMMON
-                      auth
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('vfstest',
+bld.SAMBA3_BINARY('test_mdsparser_es',
                  source='''
-                        torture/cmd_vfs.c
-                        torture/vfstest.c
-                        torture/vfstest_chain.c
-                        ''',
+                 rpc_server/mdssvc/test_mdsparser_es.c
+                 rpc_server/mdssvc/es_parser.y
+                 rpc_server/mdssvc/es_lexer.l
+                 rpc_server/mdssvc/es_mapping.c
+                 ''',
                  deps='''
-                      vfs
-                      popt_samba3
-                      smbconf
-                      SMBREADLINE
-                      ''',
-                 install=False)
+                 samba3-util
+                 talloc
+                 smbconf
+                 jansson
+                 cmocka
+                 CMDLINE_S3
+                 ''',
+                 enabled=bld.env.spotlight_backend_es,
+                 for_selftest=True)
 
 bld.SAMBA3_BINARY('versiontest',
                  source='lib/version_test.c',
@@ -1286,15 +1207,7 @@ bld.SAMBA3_BINARY('versiontest',
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
-                 install=False)
-
-bld.SAMBA3_BINARY('rpc_open_tcp',
-                 source='torture/rpc_open_tcp.c',
-                 deps='''
-                      talloc
-                      msrpc3
-                      ''',
-                 install=False)
+                 for_selftest=True)
 
 bld.SAMBA3_BINARY('vlp',
                  source='printing/tests/vlp.c',
@@ -1302,7 +1215,7 @@ bld.SAMBA3_BINARY('vlp',
                       talloc
                       smbconf
                       ''',
-                 install=False)
+                 for_selftest=True)
 
 
 pyrpc_util = bld.pyembed_libname('pyrpc_util')
@@ -1317,7 +1230,7 @@ pycredentials = 'pycredentials'
 bld.SAMBA3_PYTHON('pylibsmb',
                   source='libsmb/pylibsmb.c',
                   deps='smbclient samba-credentials %s' % pycredentials,
-                  realname='samba/samba3/libsmb_samba_internal.so'
+                  realname='samba/samba3/libsmb_samba_cwrapper.so'
                   )
 
 bld.SAMBA3_PYTHON('pymdscli',
@@ -1325,6 +1238,11 @@ bld.SAMBA3_PYTHON('pymdscli',
                   deps=' '.join(['RPCCLI_MDSSVC', pytalloc_util, pyrpc_util]),
                   realname='samba/samba3/mdscli.so')
 
+bld.SAMBA3_PYTHON('pys3smbconf',
+                  source='lib/smbconf/pys3smbconf.c',
+                  deps='smbconf',
+                  realname='samba/samba3/smbconf.so')
+
 bld.SAMBA3_BINARY('spotlight2sparql',
                  source='''
                  rpc_server/mdssvc/sparql_parser_test.c
@@ -1350,17 +1268,16 @@ bld.SAMBA3_BINARY('tevent_glib_glue_test',
                  deps='''
                  talloc
                  libsmb
-                 popt_samba3
                  tevent-glib-glue''',
                  enabled=bld.CONFIG_SET('WITH_TEVENT_GLIB_GLUE'),
-                 install=False)
+                 for_selftest=True)
 
 bld.SAMBA3_BINARY('tevent_glib_tracker',
                  source='utils/async-tracker.c',
                  deps='''
                  talloc
                  libsmb
-                 popt_samba3
+                 CMDLINE_S3
                  tevent-glib-glue ''' + bld.env['libtracker'],
                  enabled=bld.CONFIG_SET('HAVE_TRACKER') and bld.CONFIG_SET('WITH_TEVENT_GLIB_GLUE'),
                  install=False)
@@ -1378,7 +1295,6 @@ bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
 bld.RECURSE('script')
 bld.RECURSE('winbindd')
-bld.RECURSE('../examples/auth')
 bld.RECURSE('../examples/libsmbclient')
 bld.RECURSE('../examples/pdb')
 bld.RECURSE('../examples/VFS')
@@ -1391,6 +1307,7 @@ bld.RECURSE('rpcclient')
 bld.RECURSE('utils')
 bld.RECURSE('nmbd')
 bld.RECURSE('lib/util')
+bld.RECURSE('torture')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()