summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-01-02 11:16:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:51 -0500
commit3c4342ddfbe95cfbc64902177d4955882f71a4a0 (patch)
tree986c531e6f2493bafc6068a96c53a7c2bfa6bf3a
parent495c3619071abc618bc1de06e44b2f994c8c4903 (diff)
downloadsamba-3c4342ddfbe95cfbc64902177d4955882f71a4a0.tar.gz
samba-3c4342ddfbe95cfbc64902177d4955882f71a4a0.tar.bz2
samba-3c4342ddfbe95cfbc64902177d4955882f71a4a0.zip
r20465: Get rid of a redundant !NT_STATUS_IS_OK(status)
(This used to be commit ff173995cfeac216ab26faef6553be8f7f439347)
-rw-r--r--source3/smbd/nttrans.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 9061c75d33..5c96669987 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -656,8 +656,8 @@ int reply_ntcreate_and_X(connection_struct *conn,
status = can_delete(conn, fname, file_attributes, bad_path, True);
/* We're only going to fail here if it's access denied, as that's the
only error we care about for "can we delete this ?" questions. */
- if (!NT_STATUS_IS_OK(status) && (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) ||
- NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE))) {
+ if (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) ||
+ NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE)) {
restore_case_semantics(conn, file_attributes);
END_PROFILE(SMBntcreateX);
return ERROR_NT(NT_STATUS_ACCESS_DENIED);
@@ -1284,8 +1284,8 @@ static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *o
status = can_delete(conn, fname, file_attributes, bad_path, True);
/* We're only going to fail here if it's access denied, as that's the
only error we care about for "can we delete this ?" questions. */
- if (!NT_STATUS_IS_OK(status) && (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) ||
- NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE))) {
+ if (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) ||
+ NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE)) {
restore_case_semantics(conn, file_attributes);
return ERROR_NT(status);
}