[SCM] Samba Shared Repository - branch master updated

[Anoop C S]

The branch, master has been updated
       via  232ab02faf9 source3/wscript: Introduce auto mode to build ceph vfs modules
      from  168966a0530 s3:smbd: fix NULL dereference in case of readlink failure

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


- Log -----------------------------------------------------------------
commit 232ab02faf9615c55c362c60e06381ea02421794
Author: Anoop C S <anoopcs at samba.org>
Date:   Mon Aug 5 18:51:49 2024 +0530

    source3/wscript: Introduce auto mode to build ceph vfs modules
    
    Use 'auto' mode as the default for building ceph vfs modules so that an
    explicit --enable-cephfs can reliably fail in the absence of required
    dependencies.
    
    ref: https://lists.samba.org/archive/samba/2024-August/249569.html
    
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Anoop C S <anoopcs at samba.org>
    Autobuild-Date(master): Tue Aug 27 06:18:51 UTC 2024 on atb-devel-224

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

Summary of changes:
 source3/wscript | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 2cf537704b2..f746a67b800 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -87,7 +87,7 @@ def options(opt):
                           help=("Include AFS fake-kaserver support"), default=False)
 
     opt.samba_add_onoff_option('glusterfs', with_name="enable", without_name="disable", default=True)
-    opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=True)
+    opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=None)
 
     opt.add_option('--enable-vxfs',
                   help=("enable support for VxFS (default=no)"),
@@ -1619,17 +1619,27 @@ int main(void) {
 
     conf.env['CFLAGS_CEPHFS'] = "-D_FILE_OFFSET_BITS=64"
 
-    if (Options.options.with_cephfs and
+    if (Options.options.with_cephfs is not False and
         conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
         conf.CHECK_LIB('cephfs', shlib=True)):
         if (Options.options.with_acl_support and
             conf.CHECK_FUNCS_IN('ceph_statx ceph_openat', 'cephfs',
                                 headers='cephfs/libcephfs.h')):
             conf.DEFINE('HAVE_CEPH', '1')
+
+    if conf.CONFIG_SET('HAVE_CEPH'):
+        Logs.info("building ceph vfs modules")
+    else:
+        if Options.options.with_cephfs == False:
+            Logs.info("not building ceph vfs modules(--disable-cephfs)")
+        elif Options.options.with_cephfs == True:
+            Logs.error("acl support disabled or ceph_statx/ceph_openat not "
+                       "available, cannot build ceph vfs modules")
+            conf.fatal("acl support disabled or ceph_statx/ceph_openat not "
+                       "available, but --enable-cephfs was specified")
         else:
-            Logs.warn('''Ceph support disabled due to --without-acl-support
-                      or lack of ceph_statx/ceph_openat support''')
-            conf.undefine('HAVE_CEPH')
+            Logs.warn("acl support disabled or ceph_statx/ceph_openat not "
+                       "available, not building ceph vfs modules")
 
     if Options.options.with_glusterfs:
         conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs',


-- 
Samba Shared Repository