[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  926db374a61 smbd: fix "ea support = no"
      from  ed35fce4fe4 vfs_btrfs: fix btrfs_fget_compression()

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


- Log -----------------------------------------------------------------
commit 926db374a615e88003c99a476f45981beb30f8cf
Author: Ralph Boehme <slow at samba.org>
Date:   Sat Sep 11 12:33:37 2021 +0200

    smbd: fix "ea support = no"
    
    Introduced by de83946311d8c1f007c236751280e9f101cc3a29.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14829
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Sep 11 21:48:01 UTC 2021 on sn-devel-184

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

Summary of changes:
 source3/smbd/trans2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a6bd232f679..cd6b61429c5 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -658,11 +658,12 @@ static unsigned int estimate_ea_size(files_struct *fsp)
 		return 0;
 	}
 
-	mem_ctx = talloc_stackframe();
 	if (!lp_ea_support(SNUM(fsp->conn))) {
 		return 0;
 	}
 
+	mem_ctx = talloc_stackframe();
+
 	/* If this is a stream fsp, then we need to instead find the
 	 * estimated ea len from the main file, not the stream
 	 * (streams cannot have EAs), but the estimate isn't just 0 in


-- 
Samba Shared Repository