ldb: move struct ldb_debug_ops to ldb_private.h

[samba.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index b5d12a499f3b747fd53f22043b0cccb17c0c3eb4..59b65f41239f2dd71e083d0016c2285881b34604 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -98,11 +98,13 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
                            lib/tldap.c
                            lib/tldap_util.c
                            lib/tldap_gensec_bind.c
+                           lib/tldap_tls_connect.c
                            ''',
                     deps='''
                          asn1util
                          LIBTSOCKET
                          samba3util
+                         LIBTLS
                          ''')
 
 bld.SAMBA3_BINARY('test_tldap',
@@ -111,6 +113,7 @@ bld.SAMBA3_BINARY('test_tldap',
                        asn1util
                        LIBTSOCKET
                        samba3util
+                       LIBTLS
                        smbconf
                        cmocka
                        ''',
@@ -422,7 +425,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                           libsmb/clientgen.c
                           libsmb/cliconnect.c
                           libsmb/clifile.c
-                          libsmb/clispnego.c
                           libsmb/clirap.c
                           libsmb/clierror.c
                           libsmb/climessage.c
@@ -431,7 +433,6 @@ bld.SAMBA3_LIBRARY('libsmb',
                           libsmb/cliprint.c
                           libsmb/clitrans.c
                           libsmb/clisecdesc.c
-                          libsmb/clistr.c
                           libsmb/cliquota.c
                           libsmb/clifsinfo.c
                           libsmb/clidfs.c
@@ -470,7 +471,7 @@ bld.SAMBA3_LIBRARY('secrets3',
                           passdb/secrets_lsa.c
                           ''',
                    deps='''
-                        NDR_SECRETS
+                        ndr-samba4
                         smbconf
                         samba3util
                         dbwrap
@@ -496,8 +497,8 @@ bld.SAMBA3_LIBRARY('ads',
                           libads/ldap.c
                           libads/sasl.c
                           libads/sasl_wrapping.c
+                          libads/tls_wrapping.c
                           libads/krb5_setpw.c
-                          libads/kerberos_util.c
                           libads/ldap_user.c
                           libads/ads_struct.c
                           libads/kerberos_keytab.c
@@ -505,7 +506,6 @@ bld.SAMBA3_LIBRARY('ads',
                           libads/ldap_utils.c
                           libads/ldap_schema.c
                           libads/util.c
-                          libads/ndr.c
                           libads/net_ads_setspn.c
                           ''',
                    deps='''
@@ -521,6 +521,7 @@ bld.SAMBA3_LIBRARY('ads',
                         DCUTIL
                         smbldap
                         trusts_util
+                        NDR_ADS
                         ''',
                    private_library=True)
 
@@ -572,7 +573,7 @@ bld.SAMBA3_LIBRARY('smbconf',
                         ''',
                    public_headers='../lib/smbconf/smbconf.h',
                    pc_files=[],
-                   vnum='0')
+                   vnum='0.0.1')
 
 bld.SAMBA3_SUBSYSTEM('sysquotas',
                      source='''
@@ -597,6 +598,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
@@ -611,15 +633,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
@@ -629,13 +647,11 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/sec_ctx.c
                           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
@@ -647,9 +663,9 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           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
@@ -675,6 +691,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           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
@@ -686,16 +703,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
                           smbd/conn.c
                           rpc_server/srv_pipe_hnd.c
                           rpc_server/rpc_ncacn_np.c
-                          ''' + NOTIFY_SOURCES,
+                          ''' + NOTIFY_SOURCES + SMB1_SOURCES,
                    deps='''
                         talloc
                         tevent
@@ -742,6 +758,7 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
                     deps='''
                          tdb
                          talloc
+                         vfs
                          LEASES_DB
                          LEASES_UTIL
                          NDR_OPEN_FILES
@@ -758,11 +775,14 @@ bld.SAMBA3_SUBSYSTEM('LEASES_UTIL',
                     deps='NDR_OPEN_FILES')
 
 if bld.CONFIG_GET("WITH_PROFILE"):
+    bld.SAMBA_SUBSYSTEM('PROFILE_READ',
+                        source='profile/profile_read.c',
+                        deps='gnutls talloc tdb')
     bld.SAMBA3_SUBSYSTEM('PROFILE',
                          source='profile/profile.c',
                          deps='''
                               samba-util
-                              gnutls
+                              PROFILE_READ
                               ''')
 else:
     bld.SAMBA3_SUBSYSTEM('PROFILE',
@@ -884,6 +904,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
                           LIBTSOCKET
                           LIBCLI_NETLOGON
                           samba3util
+                          smbconf
                           addns
                           lmhosts
                           resolv
@@ -921,8 +942,7 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
                          ''')
 
 bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
-                    source='lib/version.c',
-                    deps='samba-util')
+                    source='lib/version.c')
 
 bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source='libsmb/samlogon_cache.c',
@@ -1063,9 +1083,15 @@ bld.SAMBA3_SUBSYSTEM('RPCCLI_MDSSVC',
                     ''',
                     deps='mdssvc RPC_NDR_MDSSVC')
 
+bld.SAMBA3_SUBSYSTEM('RPCCLI_WSP',
+                    source='''
+                    rpc_client/wsp_cli.c
+                    ''',
+                    deps='tevent-util tstream_binding_handle')
+
 bld.SAMBA3_SUBSYSTEM('INIT_LSA',
                     source='rpc_client/init_lsa.c',
-                    deps='samba-util')
+                    deps='samba-util GNUTLS_HELPERS')
 
 bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
                     source='rpc_client/init_samr.c',
@@ -1084,6 +1110,11 @@ 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')
 
@@ -1106,6 +1137,9 @@ bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
                      source='lib/tdb_validate.c',
                      deps='samba-util')
 
+bld.SAMBA3_SUBSYSTEM('util_sd',
+                     deps='smbclient',
+                     source='lib/util_sd.c')
 
 bld.SAMBA3_BINARY('client/smbclient',
                  source='''
@@ -1217,6 +1251,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