svn commit: samba r20465 - in branches/SAMBA_3_0/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-02 11:16:27 +0000 (Tue, 02 Jan 2007)
New Revision: 20465

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20465

Log:
Get rid of a redundant !NT_STATUS_IS_OK(status)
Modified:
   branches/SAMBA_3_0/source/smbd/nttrans.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/nttrans.c	2007-01-02 11:13:03 UTC (rev 20464)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c	2007-01-02 11:16:27 UTC (rev 20465)
@@ -656,8 +656,8 @@
 		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 @@
 		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);
 		}