From 8f9bf74fbfc15cae10d4cf1249280f82e7410fab Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 17 Nov 2015 15:19:31 +0100 Subject: [PATCH] smbd: Simplify check_access() Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Nov 17 22:58:10 CET 2015 on sn-devel-104 --- source3/smbd/trans2.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index dd226ee1a65..11c97e89269 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -72,19 +72,16 @@ NTSTATUS check_access(connection_struct *conn, const struct smb_filename *smb_fname, uint32_t access_mask) { + NTSTATUS status; + if (fsp) { - NTSTATUS status = check_access_fsp(fsp, access_mask); - return status; + status = check_access_fsp(fsp, access_mask); } else { - NTSTATUS status = smbd_check_access_rights(conn, - smb_fname, - false, - access_mask); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - return NT_STATUS_OK; + status = smbd_check_access_rights(conn, smb_fname, + false, access_mask); } + + return status; } /******************************************************************** -- 2.34.1