From: Jeremy Allison <jra@samba.org>
Date: Tue, 22 Feb 2005 05:11:37 +0000 (+0000)
Subject: r5497: Fix for DIR1 failures in build farm. It struck me that we
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5242
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=360800592c55c9dd8fd787944b3d482f2b9eb951;p=thirdparty%2Fsamba.git

r5497: Fix for DIR1 failures in build farm. It struck me that we
only care about failing with ACCESS_DENIED if we can't delete
with DELETE access requested. All other errors will be processed
as normal.
Jeremy.
---

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index ea155a8edb1..53fee175afd 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -782,7 +782,9 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
 
 	if (desired_access & DELETE_ACCESS) {
 		status = can_delete(conn, fname, file_attributes, bad_path, True);
-		if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status,NT_STATUS_FILE_IS_A_DIRECTORY)) {
+		/* 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)) {
 			restore_case_semantics(conn, file_attributes);
 			END_PROFILE(SMBntcreateX);
 			return ERROR_NT(status);
@@ -1330,7 +1332,9 @@ static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *o
     
 	if (desired_access & DELETE_ACCESS) {
 		status = can_delete(conn, fname, file_attributes, bad_path, True);
-		if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status,NT_STATUS_FILE_IS_A_DIRECTORY)) {
+		/* 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)) {
 			restore_case_semantics(conn, file_attributes);
 			END_PROFILE(SMBntcreateX);
 			return ERROR_NT(status);