smbd: Fix a typo in a few places
[samba.git] / source3 / modules / wscript_build
index 594b27c5569f6408de97fcd317b6672c4f741418..1f0aa44ff1bbf293c228b9a4c2781ed53ad5d37b 100644 (file)
@@ -1,80 +1,79 @@
 #!/usr/bin/env python
 
-VFS_DEFAULT_SRC = '''vfs_default.c'''
-VFS_AUDIT_SRC = '''vfs_audit.c'''
-VFS_EXTD_AUDIT_SRC = '''vfs_extd_audit.c'''
-VFS_FULL_AUDIT_SRC = '''vfs_full_audit.c'''
-VFS_FAKE_PERMS_SRC = '''vfs_fake_perms.c'''
-VFS_FAKE_ACLS_SRC = '''vfs_fake_acls.c'''
-VFS_RECYCLE_SRC = '''vfs_recycle.c'''
-VFS_NETATALK_SRC = '''vfs_netatalk.c'''
-VFS_DEFAULT_QUOTA_SRC = '''vfs_default_quota.c'''
-VFS_READONLY_SRC = '''vfs_readonly.c getdate.c'''
-VFS_CAP_SRC = '''vfs_cap.c'''
-VFS_EXPAND_MSDFS_SRC = '''vfs_expand_msdfs.c'''
-VFS_SHADOW_COPY_SRC = '''vfs_shadow_copy.c'''
-VFS_SHADOW_COPY2_SRC = '''vfs_shadow_copy2.c'''
-VFS_AFSACL_SRC = '''vfs_afsacl.c'''
-VFS_XATTR_TDB_SRC = '''vfs_xattr_tdb.c'''
-VFS_POSIXACL_SRC = '''vfs_posixacl.c'''
-VFS_AIXACL_SRC = '''vfs_aixacl.c'''
-VFS_AIXACL2_SRC = '''vfs_aixacl2.c'''
-VFS_SOLARISACL_SRC = '''vfs_solarisacl.c'''
-VFS_ZFSACL_SRC = '''vfs_zfsacl.c'''
-VFS_HPUXACL_SRC = '''vfs_hpuxacl.c'''
-VFS_IRIXACL_SRC = '''vfs_irixacl.c'''
-VFS_TRU64ACL_SRC = '''vfs_tru64acl.c'''
-VFS_CATIA_SRC = 'vfs_catia.c'
-VFS_STREAMS_XATTR_SRC = 'vfs_streams_xattr.c'
-VFS_STREAMS_DEPOT_SRC = 'vfs_streams_depot.c'
-VFS_CACHEPRIME_SRC = 'vfs_cacheprime.c'
-VFS_PREALLOC_SRC = 'vfs_prealloc.c'
-VFS_COMMIT_SRC = 'vfs_commit.c'
-VFS_GPFS_SRC = 'vfs_gpfs.c gpfs.c'
-VFS_NOTIFY_FAM_SRC = 'vfs_notify_fam.c'
-VFS_READAHEAD_SRC = 'vfs_readahead.c'
-VFS_TSMSM_SRC = 'vfs_tsmsm.c'
-VFS_FILEID_SRC = 'vfs_fileid.c'
-VFS_AIO_FORK_SRC = 'vfs_aio_fork.c'
-VFS_AIO_PTHREAD_SRC = 'vfs_aio_pthread.c'
-VFS_AIO_POSIX_SRC = 'vfs_aio_posix.c'
-VFS_AIO_LINUX_SRC = 'vfs_aio_linux.c'
-VFS_PREOPEN_SRC = 'vfs_preopen.c'
-VFS_SYNCOPS_SRC = 'vfs_syncops.c'
-VFS_ACL_XATTR_SRC = 'vfs_acl_xattr.c'
-VFS_ACL_TDB_SRC = 'vfs_acl_tdb.c'
-VFS_SMB_TRAFFIC_ANALYZER_SRC = 'vfs_smb_traffic_analyzer.c'
-VFS_DIRSORT_SRC = 'vfs_dirsort.c'
-VFS_SCANNEDONLY_SRC = 'vfs_scannedonly.c'
-VFS_CROSSRENAME_SRC = 'vfs_crossrename.c'
-VFS_LINUX_XFS_SGID_SRC = 'vfs_linux_xfs_sgid.c'
-VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
-
-
 bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
                     source='nfs4_acls.c',
                     deps='samba-util tdb')
 
+bld.SAMBA3_BINARY('test_nfs4_acls',
+                  source='test_nfs4_acls.c',
+                  deps='smbd_base cmocka',
+                  for_selftest=True)
+
+bld.SAMBA3_SUBSYSTEM('vfs_acl_common',
+                     source='vfs_acl_common.c',
+                     deps='gnutls')
+
+bld.SAMBA3_SUBSYSTEM('POSIXACL_XATTR',
+                 source='posixacl_xattr.c',
+                 enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs')),
+                 deps='acl attr')
+
+bld.SAMBA3_SUBSYSTEM('non_posix_acls',
+                   source='non_posix_acls.c',
+                   deps='samba-util vfs')
+
+bld.SAMBA3_SUBSYSTEM('VFS_VIRUSFILTER_UTILS',
+                   source='vfs_virusfilter_utils.c',
+                   deps='strv',
+                   enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_virusfilter')))
+
 bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
                     source='vfs_aixacl_util.c',
-                    enabled=False) #fixme
+                    enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2')))
 
 bld.SAMBA3_SUBSYSTEM('vfs',
                     source='',
-                    deps='smbd_base',
-                    vars=locals())
+                    deps='smbd_base')
+
+bld.SAMBA3_SUBSYSTEM('OFFLOAD_TOKEN',
+                    source='offload_token.c',
+                    deps='samba-util')
+
+bld.SAMBA3_SUBSYSTEM('UTIL_REPARSE',
+                    source='util_reparse.c',
+                    deps='samba-util')
 
+bld.SAMBA3_SUBSYSTEM('HASH_INODE',
+                    source='hash_inode.c',
+                    deps='gnutls')
+
+#
+# This is always be static, see
+# source3/wscript: required_static_modules
+#
 bld.SAMBA3_MODULE('vfs_default',
                  subsystem='vfs',
-                 source=VFS_DEFAULT_SRC,
-                 deps='samba-util NDR_DFSBLOBS',
+                 source='vfs_default.c',
+                 deps='samba-util NDR_DFSBLOBS OFFLOAD_TOKEN UTIL_REPARSE',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
 
+#
+# This is always be static, see
+# source3/wscript: required_static_modules
+#
+bld.SAMBA3_MODULE('vfs_not_implemented',
+                 subsystem='vfs',
+                 source='vfs_not_implemented.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_not_implemented'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_not_implemented'))
+
 bld.SAMBA3_MODULE('vfs_audit',
                  subsystem='vfs',
-                 source=VFS_AUDIT_SRC,
+                 source='vfs_audit.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
@@ -82,7 +81,7 @@ bld.SAMBA3_MODULE('vfs_audit',
 
 bld.SAMBA3_MODULE('vfs_extd_audit',
                  subsystem='vfs',
-                 source=VFS_EXTD_AUDIT_SRC,
+                 source='vfs_extd_audit.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
@@ -90,15 +89,20 @@ bld.SAMBA3_MODULE('vfs_extd_audit',
 
 bld.SAMBA3_MODULE('vfs_full_audit',
                  subsystem='vfs',
-                 source=VFS_FULL_AUDIT_SRC,
+                 source='vfs_full_audit.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit'))
 
+bld.SAMBA3_BINARY('test_vfs_full_audit',
+                  source='test_vfs_full_audit.c',
+                  deps='smbd_base cmocka',
+                  for_selftest=True)
+
 bld.SAMBA3_MODULE('vfs_fake_perms',
                  subsystem='vfs',
-                 source=VFS_FAKE_PERMS_SRC,
+                 source='vfs_fake_perms.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
@@ -106,47 +110,56 @@ bld.SAMBA3_MODULE('vfs_fake_perms',
 
 bld.SAMBA3_MODULE('vfs_fake_acls',
                  subsystem='vfs',
-                 source=VFS_FAKE_ACLS_SRC,
+                 source='vfs_fake_acls.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_acls'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'),
+                 install=False)
 
 bld.SAMBA3_MODULE('vfs_recycle',
                  subsystem='vfs',
-                 source=VFS_RECYCLE_SRC,
+                 source='vfs_recycle.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle'))
 
-bld.SAMBA3_MODULE('vfs_netatalk',
+bld.SAMBA3_MODULE('vfs_fruit',
                  subsystem='vfs',
-                 source=VFS_NETATALK_SRC,
-                 deps='samba-util',
+                 source='vfs_fruit.c',
+                 deps='samba-util OFFLOAD_TOKEN STRING_REPLACE HASH_INODE ADOUBLE',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fruit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fruit'))
 
 bld.SAMBA3_MODULE('vfs_default_quota',
                  subsystem='vfs',
-                 source=VFS_DEFAULT_QUOTA_SRC,
+                 source='vfs_default_quota.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
 
+module_cflags=''
+if bld.CONFIG_SET('HAVE_WNO_STRICT_OVERFLOW'):
+    module_cflags += ' -Wno-strict-overflow'
+
+if bld.CONFIG_SET('HAVE_WNO_UNUSED_BUT_SET_VARIABLE'):
+    module_cflags += ' -Wno-unused-but-set-variable'
+
 bld.SAMBA3_MODULE('vfs_readonly',
                  subsystem='vfs',
-                 source=VFS_READONLY_SRC,
+                 source='vfs_readonly.c getdate.c',
                  deps='samba-util',
+                 cflags_end=module_cflags,
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
 
 bld.SAMBA3_MODULE('vfs_cap',
                  subsystem='vfs',
-                 source=VFS_CAP_SRC,
+                 source='vfs_cap.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
@@ -154,7 +167,7 @@ bld.SAMBA3_MODULE('vfs_cap',
 
 bld.SAMBA3_MODULE('vfs_expand_msdfs',
                  subsystem='vfs',
-                 source=VFS_EXPAND_MSDFS_SRC,
+                 source='vfs_expand_msdfs.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
@@ -162,7 +175,7 @@ bld.SAMBA3_MODULE('vfs_expand_msdfs',
 
 bld.SAMBA3_MODULE('vfs_shadow_copy',
                  subsystem='vfs',
-                 source=VFS_SHADOW_COPY_SRC,
+                 source='vfs_shadow_copy.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
@@ -170,7 +183,8 @@ bld.SAMBA3_MODULE('vfs_shadow_copy',
 
 bld.SAMBA3_MODULE('vfs_shadow_copy2',
                  subsystem='vfs',
-                 source=VFS_SHADOW_COPY2_SRC,
+                 source='vfs_shadow_copy2.c',
+                 allow_warnings=True,
                  deps='samba-util tdb',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
@@ -178,7 +192,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy2',
 
 bld.SAMBA3_MODULE('vfs_afsacl',
                  subsystem='vfs',
-                 source=VFS_AFSACL_SRC,
+                 source='vfs_afsacl.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
@@ -186,7 +200,7 @@ bld.SAMBA3_MODULE('vfs_afsacl',
 
 bld.SAMBA3_MODULE('vfs_xattr_tdb',
                  subsystem='vfs',
-                 source=VFS_XATTR_TDB_SRC,
+                 source='vfs_xattr_tdb.c',
                  deps='dbwrap xattr_tdb',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_xattr_tdb'),
@@ -202,15 +216,20 @@ bld.SAMBA3_MODULE('vfs_posix_eadb',
 
 bld.SAMBA3_MODULE('vfs_posixacl',
                  subsystem='vfs',
-                 source=VFS_POSIXACL_SRC,
+                 source='vfs_posixacl.c',
                  deps='acl attr',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posixacl'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_posixacl'))
 
+bld.SAMBA3_BINARY('test_vfs_posixacl',
+                  source='test_vfs_posixacl.c',
+                  deps='smbd_base cmocka',
+                  for_selftest=True)
+
 bld.SAMBA3_MODULE('vfs_aixacl',
                  subsystem='vfs',
-                 source=VFS_AIXACL_SRC,
+                 source='vfs_aixacl.c',
                  deps='VFS_AIXACL_UTIL',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl'),
@@ -218,7 +237,7 @@ bld.SAMBA3_MODULE('vfs_aixacl',
 
 bld.SAMBA3_MODULE('vfs_aixacl2',
                  subsystem='vfs',
-                 source=VFS_AIXACL2_SRC,
+                 source='vfs_aixacl2.c',
                  deps='NFS4_ACLS VFS_AIXACL_UTIL',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl2'),
@@ -226,7 +245,7 @@ bld.SAMBA3_MODULE('vfs_aixacl2',
 
 bld.SAMBA3_MODULE('vfs_solarisacl',
                  subsystem='vfs',
-                 source=VFS_SOLARISACL_SRC,
+                 source='vfs_solarisacl.c',
                  init_function='',
                  deps='sec',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'),
@@ -234,52 +253,81 @@ bld.SAMBA3_MODULE('vfs_solarisacl',
 
 bld.SAMBA3_MODULE('vfs_zfsacl',
                  subsystem='vfs',
-                 source=VFS_ZFSACL_SRC,
+                 source='vfs_zfsacl.c',
                  deps='NFS4_ACLS sunacl',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
 
+if bld.SAMBA3_IS_ENABLED_MODULE('vfs_nfs4acl_xattr'):
+    bld.SAMBA_GENERATOR('nfs41acl-h',
+                        source='nfs41acl.x',
+                        target='nfs41acl.h',
+                        rule='rpcgen -h ${SRC} > ${TGT}')
+
+    if bld.CONFIG_SET("HAVE_RPC_XDR_H"):
+        xdr_buf_hack = r'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"'
+
+        # By default rpcgen assumes that the input file, generated header and
+        # source file are located in the same directory, which is extracted from
+        # the provided path to the input file.
+        # However if the build directory is not under the source tree, ${SRC} will
+        # be a long relative path through a common parent directory, resulting
+        # in an invalid path used in #include for the header.
+        # In order to fix that, the input file is first copied to the output build
+        # directory and then rpcgen is called with the proper path.
+        bld.SAMBA_GENERATOR('nfs41acl-xdr-c',
+                            source='nfs41acl.x',
+                            target='nfs41acl_xdr.c',
+                            rule='cp -f ${SRC} ${TGT[0].parent} && rpcgen -c ' \
+                                 '${TGT[0].path_from(tsk.get_cwd())[:-len(tsk.outputs[0].name)] + tsk.inputs[0].name} | ' + \
+                                 xdr_buf_hack + ' > ${TGT}')
+
+        bld.SAMBA_SUBSYSTEM('VFS_NFS4_XDR',
+                            source='nfs41acl_xdr.c',
+                            deps='NFS4_ACLS NDR_NFS4ACL tirpc')
+    else:
+        bld.SET_TARGET_TYPE('VFS_NFS4_XDR', 'EMPTY')
+
+    bld.SAMBA3_MODULE('vfs_nfs4acl_xattr',
+                      subsystem='vfs',
+                      source = '''
+                               vfs_nfs4acl_xattr.c
+                               nfs4acl_xattr_ndr.c
+                               nfs4acl_xattr_xdr.c
+                               nfs4acl_xattr_nfs.c
+                               nfs4acl_xattr_util.c
+                               ''',
+                      deps='NFS4_ACLS sunacl NDR_NFS4ACL VFS_NFS4_XDR',
+                      init_function='',
+                      internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'))
+
 bld.SAMBA3_MODULE('vfs_hpuxacl',
                  subsystem='vfs',
-                 source=VFS_HPUXACL_SRC,
+                 source='vfs_hpuxacl.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_hpuxacl'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_hpuxacl'))
 
-bld.SAMBA3_MODULE('vfs_irixacl',
-                 subsystem='vfs',
-                 source=VFS_IRIXACL_SRC,
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_irixacl'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_irixacl'))
-
-bld.SAMBA3_MODULE('vfs_tru64acl',
-                 subsystem='vfs',
-                 source=VFS_TRU64ACL_SRC,
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_true64acl'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_true64acl'))
-
 bld.SAMBA3_MODULE('vfs_catia',
                  subsystem='vfs',
-                 source=VFS_CATIA_SRC,
-                 deps='samba-util',
+                 source='vfs_catia.c',
+                 deps='samba-util STRING_REPLACE',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia'))
 
 bld.SAMBA3_MODULE('vfs_streams_xattr',
                  subsystem='vfs',
-                 source=VFS_STREAMS_XATTR_SRC,
-                 deps='samba-util',
+                 source='vfs_streams_xattr.c',
+                 deps='samba-util HASH_INODE',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr'))
 
 bld.SAMBA3_MODULE('vfs_streams_depot',
                  subsystem='vfs',
-                 source=VFS_STREAMS_DEPOT_SRC,
+                 source='vfs_streams_depot.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
@@ -287,7 +335,7 @@ bld.SAMBA3_MODULE('vfs_streams_depot',
 
 bld.SAMBA3_MODULE('vfs_cacheprime',
                  subsystem='vfs',
-                 source=VFS_CACHEPRIME_SRC,
+                 source='vfs_cacheprime.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
@@ -295,7 +343,7 @@ bld.SAMBA3_MODULE('vfs_cacheprime',
 
 bld.SAMBA3_MODULE('vfs_prealloc',
                  subsystem='vfs',
-                 source=VFS_PREALLOC_SRC,
+                 source='vfs_prealloc.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
@@ -303,7 +351,7 @@ bld.SAMBA3_MODULE('vfs_prealloc',
 
 bld.SAMBA3_MODULE('vfs_commit',
                  subsystem='vfs',
-                 source=VFS_COMMIT_SRC,
+                 source='vfs_commit.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
@@ -311,22 +359,23 @@ bld.SAMBA3_MODULE('vfs_commit',
 
 bld.SAMBA3_MODULE('vfs_gpfs',
                  subsystem='vfs',
-                 source=VFS_GPFS_SRC,
-                 deps='NFS4_ACLS',
+                 source='vfs_gpfs.c',
+                 deps='NFS4_ACLS non_posix_acls gpfswrap',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'),
+                 includes=bld.CONFIG_GET('CPPPATH_GPFS'))
 
-bld.SAMBA3_MODULE('vfs_notify_fam',
-                 subsystem='vfs',
-                 source=VFS_NOTIFY_FAM_SRC,
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_notify_fam'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_notify_fam'))
+bld.SAMBA3_BINARY('test_vfs_gpfs',
+                  source='test_vfs_gpfs.c',
+                  deps='NFS4_ACLS non_posix_acls gpfswrap cmocka',
+                  for_selftest=True,
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'),
+                  includes=bld.CONFIG_GET('CPPPATH_GPFS'))
 
 bld.SAMBA3_MODULE('vfs_readahead',
                  subsystem='vfs',
-                 source=VFS_READAHEAD_SRC,
+                 source='vfs_readahead.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
@@ -334,7 +383,7 @@ bld.SAMBA3_MODULE('vfs_readahead',
 
 bld.SAMBA3_MODULE('vfs_tsmsm',
                  subsystem='vfs',
-                 source=VFS_TSMSM_SRC,
+                 source='vfs_tsmsm.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
@@ -342,7 +391,7 @@ bld.SAMBA3_MODULE('vfs_tsmsm',
 
 bld.SAMBA3_MODULE('vfs_fileid',
                  subsystem='vfs',
-                 source=VFS_FILEID_SRC,
+                 source='vfs_fileid.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
@@ -350,43 +399,31 @@ bld.SAMBA3_MODULE('vfs_fileid',
 
 bld.SAMBA3_MODULE('vfs_aio_fork',
                  subsystem='vfs',
-                 source=VFS_AIO_FORK_SRC,
+                 source='vfs_aio_fork.c',
                  deps='samba-util tevent',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'),
-                  allow_undefined_symbols=True)
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
 
 bld.SAMBA3_MODULE('vfs_aio_pthread',
                  subsystem='vfs',
-                 source=VFS_AIO_PTHREAD_SRC,
+                 source='vfs_aio_pthread.c',
                  deps='samba-util tevent',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_pthread'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_pthread'),
-                  allow_undefined_symbols=True)
-
-bld.SAMBA3_MODULE('vfs_aio_posix',
-                 subsystem='vfs',
-                 source=VFS_AIO_POSIX_SRC,
-                 deps='samba-util tevent',
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_posix'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_posix'),
-                  allow_undefined_symbols=True)
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_pthread'))
 
-bld.SAMBA3_MODULE('vfs_aio_linux',
+bld.SAMBA3_MODULE('vfs_io_uring',
                  subsystem='vfs',
-                 source=VFS_AIO_LINUX_SRC,
-                 deps='samba-util aio',
+                 source='vfs_io_uring.c',
+                 deps='samba-util tevent uring',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_linux'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_linux'),
-                  allow_undefined_symbols=True)
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_io_uring'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_io_uring'))
 
 bld.SAMBA3_MODULE('vfs_preopen',
                  subsystem='vfs',
-                 source=VFS_PREOPEN_SRC,
+                 source='vfs_preopen.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
@@ -394,7 +431,7 @@ bld.SAMBA3_MODULE('vfs_preopen',
 
 bld.SAMBA3_MODULE('vfs_syncops',
                  subsystem='vfs',
-                 source=VFS_SYNCOPS_SRC,
+                 source='vfs_syncops.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
@@ -402,47 +439,31 @@ bld.SAMBA3_MODULE('vfs_syncops',
 
 bld.SAMBA3_MODULE('vfs_acl_xattr',
                  subsystem='vfs',
-                 source=VFS_ACL_XATTR_SRC,
-                 deps='samba-util',
+                 source='vfs_acl_xattr.c',
+                 deps='samba-util vfs_acl_common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr'))
 
 bld.SAMBA3_MODULE('vfs_acl_tdb',
                  subsystem='vfs',
-                 source=VFS_ACL_TDB_SRC,
-                 deps='NDR_XATTR tdb',
+                 source='vfs_acl_tdb.c',
+                 deps='samba-util vfs_acl_common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_tdb'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_tdb'))
 
-bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
-                 subsystem='vfs',
-                 source=VFS_SMB_TRAFFIC_ANALYZER_SRC,
-                 deps='samba-util',
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_smb_traffic_analyzer'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_smb_traffic_analyzer'))
-
 bld.SAMBA3_MODULE('vfs_dirsort',
                  subsystem='vfs',
-                 source=VFS_DIRSORT_SRC,
+                 source='vfs_dirsort.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dirsort'))
 
-bld.SAMBA3_MODULE('vfs_scannedonly',
-                 subsystem='vfs',
-                 source=VFS_SCANNEDONLY_SRC,
-                 deps='samba-util',
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_scannedonly'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_scannedonly'))
-
 bld.SAMBA3_MODULE('vfs_crossrename',
                  subsystem='vfs',
-                 source=VFS_CROSSRENAME_SRC,
+                 source='vfs_crossrename.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'),
@@ -450,7 +471,7 @@ bld.SAMBA3_MODULE('vfs_crossrename',
 
 bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
                  subsystem='vfs',
-                 source=VFS_LINUX_XFS_SGID_SRC,
+                 source='vfs_linux_xfs_sgid.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_linux_xfs_sgid'),
@@ -458,12 +479,28 @@ bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
 
 bld.SAMBA3_MODULE('vfs_time_audit',
                  subsystem='vfs',
-                 source=VFS_TIME_AUDIT_SRC,
+                 source='vfs_time_audit.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_time_audit'))
 
+bld.SAMBA3_MODULE('vfs_media_harmony',
+                 subsystem='vfs',
+                 source='vfs_media_harmony.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_media_harmony'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_media_harmony'))
+
+bld.SAMBA3_MODULE('vfs_unityed_media',
+                 subsystem='vfs',
+                 source='vfs_unityed_media.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_unityed_media'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_unityed_media'))
+
 bld.SAMBA3_MODULE('vfs_dfs_samba4',
                  subsystem='vfs',
                  source='vfs_dfs_samba4.c',
@@ -472,15 +509,131 @@ bld.SAMBA3_MODULE('vfs_dfs_samba4',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dfs_samba4') and bld.AD_DC_BUILD_IS_ENABLED(),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dfs_samba4') and bld.AD_DC_BUILD_IS_ENABLED())
 
-PERFCOUNT_TEST_SRC = 'perfcount_test.c'
+bld.SAMBA3_MODULE('vfs_btrfs',
+                 subsystem='vfs',
+                 source='vfs_btrfs.c',
+                 deps='samba-util OFFLOAD_TOKEN',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_btrfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_btrfs'))
+
+bld.SAMBA3_MODULE('vfs_shell_snap',
+                 subsystem='vfs',
+                 source='vfs_shell_snap.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shell_snap'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shell_snap'))
 
 bld.SAMBA3_SUBSYSTEM('perfcount',
                     source='',
                      deps='smbd_base')
 
-bld.SAMBA3_MODULE('perfcount_test',
-                 subsystem='perfcount',
-                 source=PERFCOUNT_TEST_SRC,
+bld.SAMBA3_MODULE('vfs_ceph',
+                 subsystem='vfs',
+                 source='vfs_ceph.c',
+                 deps='POSIXACL_XATTR samba-util cephfs',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_ceph'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph'),
+                 cflags=bld.CONFIG_GET('CFLAGS_CEPHFS'),
+                 includes=bld.CONFIG_GET('CPPPATH_CEPHFS'))
+
+bld.SAMBA3_MODULE('vfs_ceph_snapshots',
+                 subsystem='vfs',
+                 source='vfs_ceph_snapshots.c',
+                 deps='samba-util',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_ceph_snapshots'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph_snapshots'))
+
+bld.SAMBA3_MODULE('vfs_glusterfs',
+                  subsystem='vfs',
+                  source='vfs_glusterfs.c',
+                  deps='POSIXACL_XATTR samba-util gfapi',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_glusterfs'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs'))
+
+bld.SAMBA3_MODULE('vfs_glusterfs_fuse',
+                  subsystem='vfs',
+                  source='vfs_glusterfs_fuse.c',
+                  deps='',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_glusterfs_fuse'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs_fuse'))
+
+bld.SAMBA3_MODULE('vfs_worm',
+                  subsystem='vfs',
+                  source='vfs_worm.c',
+                  deps='samba-util',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_worm'),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_worm'))
+
+bld.SAMBA3_MODULE('vfs_snapper',
+                 subsystem='vfs',
+                 source='vfs_snapper.c',
+                 deps='samba-util dbus-1',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_snapper'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_snapper'))
+
+bld.SAMBA3_MODULE('vfs_virusfilter',
+                 subsystem='vfs',
+                 source='''
+                 vfs_virusfilter.c
+                 vfs_virusfilter_sophos.c
+                 vfs_virusfilter_fsav.c
+                 vfs_virusfilter_clamav.c
+                 vfs_virusfilter_dummy.c
+                 ''',
+                 deps='samba-util VFS_VIRUSFILTER_UTILS',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_virusfilter'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_virusfilter'))
+
+bld.SAMBA3_MODULE('vfs_vxfs',
+                 subsystem='vfs',
+                 source='lib_vxfs.c vfs_vxfs.c',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_vxfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_vxfs'))
+
+bld.SAMBA3_MODULE('vfs_offline',
+                 subsystem='vfs',
+                 source='vfs_offline.c',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_offline'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_offline'))
+
+bld.SAMBA3_MODULE('vfs_fake_dfq',
+                 subsystem='vfs',
+                 source='vfs_fake_dfq.c',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_dfq'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_dfq'),
+                 install=False)
+
+bld.SAMBA3_MODULE('vfs_error_inject',
+                 subsystem='vfs',
+                 source='vfs_error_inject.c',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_error_inject'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_error_inject'),
+                 install=False)
+
+bld.SAMBA3_MODULE('vfs_delay_inject',
+                 subsystem='vfs',
+                 source='vfs_delay_inject.c',
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_delay_inject'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject'),
+                 install=False)
+
+bld.SAMBA3_MODULE('vfs_widelinks',
+                 subsystem='vfs',
+                 source='vfs_widelinks.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('perfcount_test'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('perfcount_test'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_widelinks'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_widelinks'))