[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  29992fdbfbb vfs_aixacl2: Fix "mem_ctx" and "ppdesc" smb_fget_nt_acl_nfs4 args
       via  996560191ac wscript: use --as-needed only if tested successfully
      from  1c9add54750 s3:modules:vfs_virusfilter: Recent talloc changes cause infinite start-up failure

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


- Log -----------------------------------------------------------------
commit 29992fdbfbb99470f5d13b00fe6ecf5c7ca5038f
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 3 11:20:51 2021 +0100

    vfs_aixacl2: Fix "mem_ctx" and "ppdesc" smb_fget_nt_acl_nfs4 args
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Björn Jacke <bjacke at samba.org>
    
    Autobuild-User(master): Björn Jacke <bjacke at samba.org>
    Autobuild-Date(master): Wed Mar  3 12:36:13 UTC 2021 on sn-devel-184

commit 996560191ac6bd603901dcd6c0de5d239e019ef4
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Mar 2 22:47:35 2021 +0100

    wscript: use --as-needed only if tested successfully
    
    Some OSes like Solaris based OmiOS don't support this.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14288
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source3/modules/vfs_aixacl2.c | 4 ++--
 wscript                       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 42cdf961b8f..bb42641c02d 100644
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -179,8 +179,8 @@ static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
-	status = smb_fget_nt_acl_nfs4(fsp, NULL, security_info, ppdesc,
-				      mem_ctx, pacl);
+	status = smb_fget_nt_acl_nfs4(
+		fsp, NULL, security_info, mem_ctx, ppdesc, pacl);
 	TALLOC_FREE(frame);
 	return status;
 }
diff --git a/wscript b/wscript
index 334b2988234..3c6b130bd22 100644
--- a/wscript
+++ b/wscript
@@ -340,7 +340,8 @@ def configure(conf):
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
 
-    conf.add_as_needed()
+    conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+
 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)


-- 
Samba Shared Repository