smbd: Simplify check_access()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Nov 17 22:58:10 CET 2015 on sn-devel-104

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index dd226ee1a65696ccafadda8529bc25ffd317f8b7..11c97e89269d11c847240daeeec831acb773a24b 100644 (file)
--- 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;
 }
 
 /********************************************************************