Attachment 16804 Details for Bug 14829 – Patch for 4.15 cherry-picked from master

[patch] Patch for 4.15 cherry-picked from master

bug14829-v415.patch (text/plain), 1.22 KB, created by Ralph Böhme on 2021-09-12 09:46:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2021-09-12 09:46:42 UTC

Size: 1.22 KB

patch

obsolete

>From 2a9f0dd1f253629706b77bcdd5983762df4f6cbc Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Sat, 11 Sep 2021 12:33:37 +0200
>Subject: [PATCH] smbd: fix "ea support = no"
>
>Introduced by de83946311d8c1f007c236751280e9f101cc3a29.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14829
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Sat Sep 11 21:48:01 UTC 2021 on sn-devel-184
>
>(cherry picked from commit 926db374a615e88003c99a476f45981beb30f8cf)
>---
> source3/smbd/trans2.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>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
>-- 
>2.31.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 14829: 16804