[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Wed Sep 25 00:52:03 CEST 2013


The branch, master has been updated
       via  58cb40d build: get rid of vars=locals() in source3/lib/netapi/examples/wscript_build
       via  41d818e build: get rid of vars=locals() in source3/modules/wscript_build
       via  7e96639 build: get rid of source variables and vars=locals() in source3/rpc_server/wscript_build
       via  f7112e0 build: get rid of source strings from source3/passdb/wscript_build
       via  9f15535 build: get rid of source variables and vars=locals() in source3/libgpo/gpext/wscript_build
       via  7e974db build: get rid of vars=locals() in source3/auth/wscript_build
       via  c6e1618 build: get rid of source-variables in source3/auth/wscript_build
       via  f575b5c build: get rid of source file variables in source3/modules/wscript_build
      from  f4ff81f dbcheck: Add back the elements that were wrongly removed from CN=Deleted Objects

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 58cb40d50ba7d0eb70ee1bcdae8c3bf6d9b17f8a
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 20:07:06 2013 +0200

    build: get rid of vars=locals() in source3/lib/netapi/examples/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Wed Sep 25 00:51:31 CEST 2013 on sn-devel-104

commit 41d818e8d82537d2f05b39f152593fc9a2a034d8
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 20:06:37 2013 +0200

    build: get rid of vars=locals() in source3/modules/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit 7e966397ec43e0a408f20e11403019fc94c272fc
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 20:02:54 2013 +0200

    build: get rid of source variables and vars=locals() in source3/rpc_server/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit f7112e07cc6c97cf43a1d803d804fc117a55e121
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 05:13:55 2013 +0200

    build: get rid of source strings from source3/passdb/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit 9f15535821546884f9d969f66498c6cdd32f39b9
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 05:09:38 2013 +0200

    build: get rid of source variables and vars=locals() in source3/libgpo/gpext/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit 7e974dbd92d5ccec5286e0abd1c11f6834eeab02
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 05:07:08 2013 +0200

    build: get rid of vars=locals() in source3/auth/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit c6e16183e1d969af9edf1c3eccb8502805c627b0
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 05:06:22 2013 +0200

    build: get rid of source-variables in source3/auth/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit f575b5c5312f87f8db42c307dfd90005716eaa0b
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 24 05:03:32 2013 +0200

    build: get rid of source file variables in source3/modules/wscript_build
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/wscript_build                |   37 ++----
 source3/lib/netapi/examples/wscript_build |    3 +-
 source3/libgpo/gpext/wscript_build        |   17 +--
 source3/modules/wscript_build             |  178 ++++++++++-------------------
 source3/passdb/wscript_build              |   13 +--
 source3/rpc_server/wscript_build          |  120 +++++++++-----------
 6 files changed, 135 insertions(+), 233 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index e518de9..e7a6051 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -1,21 +1,8 @@
 #!/usr/bin/env python
 
-AUTH_BUILTIN_SRC = 'auth_builtin.c'
-AUTH_DOMAIN_SRC = 'auth_domain.c'
-AUTH_SAM_SRC = 'auth_sam.c'
-AUTH_UNIX_SRC = 'auth_unix.c'
-AUTH_WINBIND_SRC = 'auth_winbind.c'
-AUTH_WBC_SRC = 'auth_wbc.c'
-AUTH_SCRIPT_SRC = 'auth_script.c'
-
-AUTH_SRC = '''auth.c
-           user_krb5.c
-           auth_ntlmssp.c auth_generic.c'''
-
 bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
                     source='token_util.c',
-                    deps='samba-util pdb',
-                    vars=locals())
+                    deps='samba-util pdb')
 
 bld.SAMBA3_SUBSYSTEM('USER_UTIL',
                      source='user_util.c',
@@ -27,24 +14,26 @@ bld.SAMBA3_SUBSYSTEM('AUTH_COMMON',
 			      server_info.c
 			      server_info_sam.c
 			      user_info.c''',
-                     deps='TOKEN_UTIL DCUTIL USER_UTIL',
-                    vars=locals())
+                     deps='TOKEN_UTIL DCUTIL USER_UTIL')
 
 bld.SAMBA3_LIBRARY('auth',
-                    source=AUTH_SRC,
+                   source='''auth.c
+                   user_krb5.c
+                   auth_ntlmssp.c
+                   auth_generic.c''',
                    deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON libcli_netlogon3 samba-hostconfig''',
                    private_library=True)
 
 bld.SAMBA3_MODULE('auth_sam',
                  subsystem='auth',
-                 source=AUTH_SAM_SRC,
+                 source='auth_sam.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=True)
 
 bld.SAMBA3_MODULE('auth_unix',
                  subsystem='auth',
-                 source=AUTH_UNIX_SRC,
+                 source='auth_unix.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
@@ -52,14 +41,14 @@ bld.SAMBA3_MODULE('auth_unix',
 
 bld.SAMBA3_MODULE('auth_winbind',
                  subsystem='auth',
-                 source=AUTH_WINBIND_SRC,
+                 source='auth_winbind.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=True)
 
 bld.SAMBA3_MODULE('auth_wbc',
                  subsystem='auth',
-                 source=AUTH_WBC_SRC,
+                 source='auth_wbc.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
@@ -67,21 +56,21 @@ bld.SAMBA3_MODULE('auth_wbc',
 
 bld.SAMBA3_MODULE('auth_domain',
                  subsystem='auth',
-                 source=AUTH_DOMAIN_SRC,
+                 source='auth_domain.c',
                  deps='RPC_CLIENT_SCHANNEL trusts_util',
                  init_function='',
                  internal_module=True)
 
 bld.SAMBA3_MODULE('auth_builtin',
                  subsystem='auth',
-                 source=AUTH_BUILTIN_SRC,
+                 source='auth_builtin.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=True)
 
 bld.SAMBA3_MODULE('auth_script',
                  subsystem='auth',
-                 source=AUTH_SCRIPT_SRC,
+                 source='auth_script.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_script'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_script'))
diff --git a/source3/lib/netapi/examples/wscript_build b/source3/lib/netapi/examples/wscript_build
index a445467..06d9a45 100644
--- a/source3/lib/netapi/examples/wscript_build
+++ b/source3/lib/netapi/examples/wscript_build
@@ -59,8 +59,7 @@ names = [
 
 bld.SAMBA_SUBSYSTEM('LIBNETAPI_EXAMPLES_COMMON',
                     source='common.c',
-                    deps='netapi popt',
-                    vars=locals())
+                    deps='netapi popt')
 
 for pattern in names:
     (subdir, name) = pattern
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index 7595fff..3a120a5 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -1,19 +1,12 @@
 #!/usr/bin/env python
 
-GPEXT_REGISTRY_SRC = 'registry.c'
-GPEXT_SCRIPTS_SRC = 'scripts.c'
-GPEXT_SECURITY_SRC = 'security.c'
-
-GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
-
 bld.SAMBA3_SUBSYSTEM('gpext',
-                    source=GPEXT_SRC,
-                    deps='samba-util samba3core gpo',
-                    vars=locals())
+                    source='../../../libgpo/gpext/gpext.c',
+                    deps='samba-util samba3core gpo')
 
 bld.SAMBA3_MODULE('gpext_registry',
                  subsystem='gpext',
-                 source=GPEXT_REGISTRY_SRC,
+                 source='registry.c',
                  deps='NDR_PREG',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_registry'),
@@ -21,14 +14,14 @@ bld.SAMBA3_MODULE('gpext_registry',
 
 bld.SAMBA3_MODULE('gpext_scripts',
                  subsystem='gpext',
-                 source=GPEXT_SCRIPTS_SRC,
+                 source='scripts.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_scripts'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_scripts'))
 
 bld.SAMBA3_MODULE('gpext_security',
                  subsystem='gpext',
-                 source=GPEXT_SECURITY_SRC,
+                 source='security.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_security'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_security'))
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 469b2f3..32e541f 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -1,60 +1,5 @@
 #!/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_NFS4ACL_XATTR_SRC = 'vfs_nfs4acl_xattr.c'
-VFS_HPUXACL_SRC = '''vfs_hpuxacl.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'
-VFS_MEDIA_HARMONY_SRC = 'vfs_media_harmony.c'
-VFS_BTRFS_SRC = 'vfs_btrfs.c'
-VFS_CEPH_SRC = 'vfs_ceph.c'
-VFS_GLUSTERFS_SRC = 'vfs_glusterfs.c'
-
-
 bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
                     source='nfs4_acls.c',
                     deps='samba-util tdb')
@@ -70,12 +15,11 @@ bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
 
 bld.SAMBA3_SUBSYSTEM('vfs',
                     source='',
-                    deps='smbd_base',
-                    vars=locals())
+                    deps='smbd_base')
 
 bld.SAMBA3_MODULE('vfs_default',
                  subsystem='vfs',
-                 source=VFS_DEFAULT_SRC,
+                 source='vfs_default.c',
                  deps='samba-util NDR_DFSBLOBS',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
@@ -83,7 +27,7 @@ bld.SAMBA3_MODULE('vfs_default',
 
 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'),
@@ -91,7 +35,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'),
@@ -99,7 +43,7 @@ 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'),
@@ -107,7 +51,7 @@ bld.SAMBA3_MODULE('vfs_full_audit',
 
 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'),
@@ -115,7 +59,7 @@ 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'),
@@ -123,7 +67,7 @@ bld.SAMBA3_MODULE('vfs_fake_acls',
 
 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'),
@@ -131,7 +75,7 @@ bld.SAMBA3_MODULE('vfs_recycle',
 
 bld.SAMBA3_MODULE('vfs_netatalk',
                  subsystem='vfs',
-                 source=VFS_NETATALK_SRC,
+                 source='vfs_netatalk.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
@@ -139,7 +83,7 @@ bld.SAMBA3_MODULE('vfs_netatalk',
 
 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'),
@@ -147,7 +91,7 @@ bld.SAMBA3_MODULE('vfs_default_quota',
 
 bld.SAMBA3_MODULE('vfs_readonly',
                  subsystem='vfs',
-                 source=VFS_READONLY_SRC,
+                 source='vfs_readonly.c getdate.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
@@ -155,7 +99,7 @@ bld.SAMBA3_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'),
@@ -163,7 +107,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'),
@@ -171,7 +115,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'),
@@ -179,7 +123,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy',
 
 bld.SAMBA3_MODULE('vfs_shadow_copy2',
                  subsystem='vfs',
-                 source=VFS_SHADOW_COPY2_SRC,
+                 source='vfs_shadow_copy2.c',
                  deps='samba-util tdb',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
@@ -187,7 +131,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'),
@@ -195,7 +139,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'),
@@ -211,7 +155,7 @@ 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'),
@@ -219,7 +163,7 @@ bld.SAMBA3_MODULE('vfs_posixacl',
 
 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'),
@@ -227,7 +171,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'),
@@ -235,7 +179,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'),
@@ -243,37 +187,37 @@ 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'))
 
 bld.SAMBA3_MODULE('vfs_nfs4acl_xattr',
-		 subsystem='vfs',
-		 source=VFS_NFS4ACL_XATTR_SRC,
-		 deps='NFS4_ACLS sunacl NDR_NFS4ACL',
-		 init_function='',
-		 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'),
-		 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_nfs4acl_xattr'))
+                  subsystem='vfs',
+                  source='vfs_nfs4acl_xattr.c',
+                  deps='NFS4_ACLS sunacl NDR_NFS4ACL',
+                  init_function='',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'),
+                  enabled=bld.SAMBA3_IS_ENABLED_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_tru64acl',
                  subsystem='vfs',
-                 source=VFS_TRU64ACL_SRC,
+                 source='vfs_tru64acl.c',
                  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,
+                 source='vfs_catia.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
@@ -281,7 +225,7 @@ bld.SAMBA3_MODULE('vfs_catia',
 
 bld.SAMBA3_MODULE('vfs_streams_xattr',
                  subsystem='vfs',
-                 source=VFS_STREAMS_XATTR_SRC,
+                 source='vfs_streams_xattr.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
@@ -289,7 +233,7 @@ bld.SAMBA3_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'),
@@ -297,7 +241,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'),
@@ -305,7 +249,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'),
@@ -313,7 +257,7 @@ bld.SAMBA3_MODULE('vfs_prealloc',
 
 bld.SAMBA3_MODULE('vfs_commit',
                  subsystem='vfs',
-                 source=VFS_COMMIT_SRC,
+                 source='vfs_commit.c',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list