[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  f258cfaa1d0 vfs:glusterfs_fuse: build only if we have setmntent()
      from  464fef34d1d tests/ldap: Use TLDAP to check the extended DN return

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


- Log -----------------------------------------------------------------
commit f258cfaa1d07af6ac6e996006f6e59955cfe34ce
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 1 00:47:29 2019 +0200

    vfs:glusterfs_fuse: build only if we have setmntent()
    
    FreeBSD and other platforms that don't have setmntent() and friends can
    not compile this module. This patch lets changes the build to only
    compile this module if the setmntent() function is found.
    
    This is the a follow-up fix to the actual fix for bug #13972.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13972
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Thu Aug  1 09:49:04 UTC 2019 on sn-devel-184

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

Summary of changes:
 source3/wscript | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index ff72a173a4b..4a3e75605e7 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1713,7 +1713,6 @@ main() {
                                       vfs_media_harmony vfs_unityed_media vfs_fruit vfs_shell_snap
                                       vfs_commit vfs_worm vfs_crossrename vfs_linux_xfs_sgid
                                       vfs_time_audit vfs_offline vfs_virusfilter
-                                      vfs_glusterfs_fuse
                                   '''))
     default_shared_modules.extend(TO_LIST('auth_script idmap_tdb2 idmap_script'))
     # these have broken dependencies
@@ -1775,6 +1774,9 @@ main() {
     if conf.CONFIG_SET('HAVE_GLUSTERFS'):
         default_shared_modules.extend(TO_LIST('vfs_glusterfs'))
 
+    if conf.CONFIG_SET('HAVE_SETMNTENT'):
+        default_shared_modules.extend(TO_LIST('vfs_glusterfs_fuse'))
+
     if conf.CONFIG_SET('HAVE_VXFS'):
         default_shared_modules.extend(TO_LIST('vfs_vxfs'))
 


-- 
Samba Shared Repository