From: Ralph Boehme <slow@samba.org>
Date: Tue, 27 Oct 2020 20:12:22 +0000 (+0100)
Subject: smbd: use check_access_fsp() in set_ea()
X-Git-Tag: samba-4.14.0rc1~306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bec96219b64009fcdd79294c5395cf0cdd79d2d;p=thirdparty%2Fsamba.git

smbd: use check_access_fsp() in set_ea()

We now always have a fsp.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b883685cddb..5ab3c285ca7 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -797,15 +797,7 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
 		return status;
 	}
 
-	if (fsp != NULL) {
-		status = check_access_fsp(fsp, FILE_WRITE_EA);
-	} else {
-		status = smbd_check_access_rights(conn,
-				conn->cwd_fsp,
-				smb_fname,
-				false,
-				FILE_WRITE_EA);
-	}
+	status = check_access_fsp(fsp, FILE_WRITE_EA);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}