[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Thu Dec 2 00:26:05 MST 2010


The branch, v3-6-test has been updated
       via  6b836d7 s3-waf: more krb5 configure checks.
       via  63d570c s3-waf: add configure check for dirfd and build vfs_syncops vfs_dirsort if possible.
       via  b47cd10 s3-waf: add idmap_ldap to default static module list.
       via  d46a151 s3-waf: align some krb5/gssapi configure checks with classic build.
       via  6e18327 s3-waf: avoid module name uppercasing.
      from  1b85863 Turns out there are lots of places in S3 where token passed in here can be NULL (become_root() sets the current security token to NULL for example). Ensure we don't crash.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 6b836d7c3c3a3880b8e8ff372d13ab70bad49996
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 15:04:55 2010 +0100

    s3-waf: more krb5 configure checks.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Dec  1 19:35:50 CET 2010 on sn-devel-104
    (cherry picked from commit 71e2d9e7e825e57e8240d61ed1091edca0089ed5)

commit 63d570c8c0e3b27d65ebfb0f0e31fd7a07a1c054
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 13:24:55 2010 +0100

    s3-waf: add configure check for dirfd and build vfs_syncops vfs_dirsort if possible.
    
    Guenther
    (cherry picked from commit 4c2ef4ffaa8846fa941037f6cbaf35c85d4b7327)

commit b47cd108e2ebca828b10f4a7df6447e671761e2a
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 13:02:15 2010 +0100

    s3-waf: add idmap_ldap to default static module list.
    
    Guenther
    (cherry picked from commit a69972944768cdb5a3fcfcfd7c37099241b0e127)

commit d46a15185f50338cdbb0e29bfae8837141e0fcef
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 12:48:15 2010 +0100

    s3-waf: align some krb5/gssapi configure checks with classic build.
    
    Guenther
    (cherry picked from commit 651a15d2521a55cb69d5f8d35c8f6840f8a297c5)

commit 6e1832789d75b52d1fa02f7bf76bac5bc01c367d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 12:10:03 2010 +0100

    s3-waf: avoid module name uppercasing.
    
    This finally allows mixed case module names like the classic build
    (./configure --shared_modules=charset_CP850)
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Dec  1 18:39:14 CET 2010 on sn-devel-104
    (cherry picked from commit 133a2ffd006062c1e55e79a1ed4fb756b182a63c)

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

Summary of changes:
 buildtools/wafsamba/samba3.py      |    4 +-
 source3/auth/wscript_build         |   36 +++---
 source3/libgpo/gpext/wscript_build |   12 +-
 source3/modules/wscript_build      |  212 ++++++++++++++++++------------------
 source3/passdb/wscript_build       |   20 ++--
 source3/rpc_server/wscript_build   |   56 +++++-----
 source3/winbindd/wscript_build     |   64 ++++++------
 source3/wscript                    |   40 ++++++-
 8 files changed, 237 insertions(+), 207 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 9abb2ab..5008abb 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -25,14 +25,14 @@ Options.Handler.SAMBA3_ADD_OPTION = SAMBA3_ADD_OPTION
 
 def SAMBA3_IS_STATIC_MODULE(bld, module):
     '''Check whether module is in static list'''
-    if module.lower() in bld.env['static_modules']:
+    if module in bld.env['static_modules']:
         return True
     return False
 Build.BuildContext.SAMBA3_IS_STATIC_MODULE = SAMBA3_IS_STATIC_MODULE
 
 def SAMBA3_IS_SHARED_MODULE(bld, module):
     '''Check whether module is in shared list'''
-    if module.lower() in bld.env['shared_modules']:
+    if module in bld.env['shared_modules']:
         return True
     return False
 Build.BuildContext.SAMBA3_IS_SHARED_MODULE = SAMBA3_IS_SHARED_MODULE
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index e740f87..e9010ff 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -31,62 +31,62 @@ bld.SAMBA_MODULE('auth_sam',
                  subsystem='auth',
                  source=AUTH_SAM_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SAM'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SAM'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam'))
 
 bld.SAMBA_MODULE('auth_unix',
                  subsystem='auth',
                  source=AUTH_UNIX_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_UNIX'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_UNIX'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix'))
 
 bld.SAMBA_MODULE('auth_winbind',
                  subsystem='auth',
                  source=AUTH_WINBIND_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_WINBIND'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_WINBIND'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind'))
 
 bld.SAMBA_MODULE('auth_wbc',
                  subsystem='auth',
                  source=AUTH_WBC_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_WBC'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_WBC'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc'))
 
 bld.SAMBA_MODULE('auth_server',
                  subsystem='auth',
                  source=AUTH_SERVER_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SERVER'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SERVER'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server'))
 
 bld.SAMBA_MODULE('auth_domain',
                  subsystem='auth',
                  source=AUTH_DOMAIN_SRC,
                  deps='RPC_CLIENT_SCHANNEL',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_DOMAIN'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_DOMAIN'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain'))
 
 bld.SAMBA_MODULE('auth_builtin',
                  subsystem='auth',
                  source=AUTH_BUILTIN_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_BUILTIN'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_BUILTIN'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin'))
 
 bld.SAMBA_MODULE('auth_netlogond',
                  subsystem='auth',
                  source=AUTH_NETLOGOND_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_NETLOGOND'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_NETLOGOND'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_netlogond'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_netlogond'))
 
 bld.SAMBA_MODULE('auth_script',
                  subsystem='auth',
                  source=AUTH_SCRIPT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SCRIPT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SCRIPT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_script'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_script'))
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index b35396d..1f6e8df 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -15,19 +15,19 @@ bld.SAMBA_MODULE('gpext_registry',
                  source=GPEXT_REGISTRY_SRC,
                  deps='NDR_PREG',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_REGISTRY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_REGISTRY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_registry'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_registry'))
 
 bld.SAMBA_MODULE('gpext_scripts',
                  subsystem='gpext',
                  source=GPEXT_SCRIPTS_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SCRIPTS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_SCRIPTS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_scripts'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_scripts'))
 
 bld.SAMBA_MODULE('gpext_security',
                  subsystem='gpext',
                  source=GPEXT_SECURITY_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SECURITY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_SECURITY'))
+                 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 8b6af85..32dfa40 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -67,338 +67,338 @@ bld.SAMBA_MODULE('vfs_default',
                  subsystem='vfs',
                  source=VFS_DEFAULT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
 
 bld.SAMBA_MODULE('vfs_audit',
                  subsystem='vfs',
                  source=VFS_AUDIT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AUDIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit'))
 
 bld.SAMBA_MODULE('vfs_extd_audit',
                  subsystem='vfs',
                  source=VFS_EXTD_AUDIT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXTD_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXTD_AUDIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit'))
 
 bld.SAMBA_MODULE('vfs_full_audit',
                  subsystem='vfs',
                  source=VFS_FULL_AUDIT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FULL_AUDIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FULL_AUDIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit'))
 
 bld.SAMBA_MODULE('vfs_fake_perms',
                  subsystem='vfs',
                  source=VFS_FAKE_PERMS_SRC,
                  deps='acl attr',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FAKE_PERMS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FAKE_PERMS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms'))
 
 bld.SAMBA_MODULE('vfs_recycle',
                  subsystem='vfs',
                  source=VFS_RECYCLE_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_RECYCLE'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_RECYCLE'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle'))
 
 bld.SAMBA_MODULE('vfs_netatalk',
                  subsystem='vfs',
                  source=VFS_NETATALK_SRC,
                  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_netatalk'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk'))
 
 bld.SAMBA_MODULE('vfs_default_quota',
                  subsystem='vfs',
                  source=VFS_DEFAULT_QUOTA_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT_QUOTA'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT_QUOTA'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
 
 bld.SAMBA_MODULE('vfs_readonly',
                  subsystem='vfs',
                  source=VFS_READONLY_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READONLY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READONLY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
 
 bld.SAMBA_MODULE('vfs_cap',
                  subsystem='vfs',
                  source=VFS_CAP_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CAP'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CAP'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cap'))
 
 bld.SAMBA_MODULE('vfs_expand_msdfs',
                  subsystem='vfs',
                  source=VFS_EXPAND_MSDFS_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXPAND_MSDFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXPAND_MSDFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_expand_msdfs'))
 
 bld.SAMBA_MODULE('vfs_shadow_copy',
                  subsystem='vfs',
                  source=VFS_SHADOW_COPY_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy'))
 
 bld.SAMBA_MODULE('vfs_shadow_copy2',
                  subsystem='vfs',
                  source=VFS_SHADOW_COPY2_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY2'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY2'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy2'))
 
 bld.SAMBA_MODULE('vfs_afsacl',
                  subsystem='vfs',
                  source=VFS_AFSACL_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AFSACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AFSACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_afsacl'))
 
 bld.SAMBA_MODULE('vfs_xattr_tdb',
                  subsystem='vfs',
                  source=VFS_XATTR_TDB_SRC,
                  deps='NDR_XATTR',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_XATTR_TDB'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_XATTR_TDB'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_xattr_tdb'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_xattr_tdb'))
 
 bld.SAMBA_MODULE('vfs_posixacl',
                  subsystem='vfs',
                  source=VFS_POSIXACL_SRC,
                  deps='acl attr',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_POSIXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_POSIXACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posixacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_posixacl'))
 
 bld.SAMBA_MODULE('vfs_aixacl',
                  subsystem='vfs',
                  source=VFS_AIXACL_SRC,
                  deps='VFS_AIXACL_UTIL',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl'))
 
 bld.SAMBA_MODULE('vfs_aixacl2',
                  subsystem='vfs',
                  source=VFS_AIXACL2_SRC,
                  deps='NFS4_ACLS VFS_AIXACL_UTIL',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL2'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL2'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl2'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2'))
 
 bld.SAMBA_MODULE('vfs_solarisacl',
                  subsystem='vfs',
                  source=VFS_SOLARISACL_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SOLARISACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SOLARISACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_solarisacl'))
 
 bld.SAMBA_MODULE('vfs_zfsacl',
                  subsystem='vfs',
                  source=VFS_ZFSACL_SRC,
                  deps='NFS4_ACLS',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ZFSACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ZFSACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
 
 bld.SAMBA_MODULE('vfs_hpuxacl',
                  subsystem='vfs',
                  source=VFS_HPUXACL_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_HPUXACL'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_HPUXACL'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_hpuxacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_hpuxacl'))
 
 bld.SAMBA_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'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_irixacl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_irixacl'))
 
 bld.SAMBA_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'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_true64acl'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_true64acl'))
 
 bld.SAMBA_MODULE('vfs_catia',
                  subsystem='vfs',
                  source=VFS_CATIA_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CATIA'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CATIA'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia'))
 
 bld.SAMBA_MODULE('vfs_streams_xattr',
                  subsystem='vfs',
                  source=VFS_STREAMS_XATTR_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_XATTR'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_XATTR'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr'))
 
 bld.SAMBA_MODULE('vfs_streams_depot',
                  subsystem='vfs',
                  source=VFS_STREAMS_DEPOT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_DEPOT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_DEPOT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_depot'))
 
 bld.SAMBA_MODULE('vfs_cacheprime',
                  subsystem='vfs',
                  source=VFS_CACHEPRIME_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CACHEPRIME'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CACHEPRIME'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cacheprime'))
 
 bld.SAMBA_MODULE('vfs_prealloc',
                  subsystem='vfs',
                  source=VFS_PREALLOC_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREALLOC'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREALLOC'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_prealloc'))
 
 bld.SAMBA_MODULE('vfs_commit',
                  subsystem='vfs',
                  source=VFS_COMMIT_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_COMMIT'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_COMMIT'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_commit'))
 
 bld.SAMBA_MODULE('vfs_gpfs',
                  subsystem='vfs',
                  source=VFS_GPFS_SRC,
                  deps='NFS4_ACLS',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_GPFS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_GPFS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'))
 
 bld.SAMBA_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'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_notify_fam'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_notify_fam'))
 
 bld.SAMBA_MODULE('vfs_readahead',
                  subsystem='vfs',
                  source=VFS_READAHEAD_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READAHEAD'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READAHEAD'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readahead'))
 
 bld.SAMBA_MODULE('vfs_tsmsm',
                  subsystem='vfs',
                  source=VFS_TSMSM_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TSMSM'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TSMSM'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_tsmsm'))
 
 bld.SAMBA_MODULE('vfs_fileid',
                  subsystem='vfs',
                  source=VFS_FILEID_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FILEID'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FILEID'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fileid'))
 
 bld.SAMBA_MODULE('vfs_aio_fork',
                  subsystem='vfs',
                  source=VFS_AIO_FORK_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIO_FORK'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIO_FORK'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
 
 bld.SAMBA_MODULE('vfs_preopen',
                  subsystem='vfs',
                  source=VFS_PREOPEN_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREOPEN'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREOPEN'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_preopen'))
 
 bld.SAMBA_MODULE('vfs_syncops',
                  subsystem='vfs',
                  source=VFS_SYNCOPS_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SYNCOPS'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SYNCOPS'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_syncops'))
 
 bld.SAMBA_MODULE('vfs_acl_xattr',
                  subsystem='vfs',
                  source=VFS_ACL_XATTR_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_XATTR'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_XATTR'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr'))
 
 bld.SAMBA_MODULE('vfs_acl_tdb',
                  subsystem='vfs',
                  source=VFS_ACL_TDB_SRC,
                  deps='NDR_XATTR',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_TDB'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_TDB'))
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_tdb'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_tdb'))
 
 bld.SAMBA_MODULE('vfs_smb_traffic_analyzer',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list