svn commit: samba r23113 - in branches/SAMBA_3_0_RELEASE/source/smbd: .

[jerry at samba.org]

Author: jerry
Date: 2007-05-24 11:51:58 +0000 (Thu, 24 May 2007)
New Revision: 23113

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

Log:
one more rename-on-an-fd fix from Jeremy
Modified:
   branches/SAMBA_3_0_RELEASE/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/reply.c	2007-05-24 11:09:37 UTC (rev 23112)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/reply.c	2007-05-24 11:51:58 UTC (rev 23113)
@@ -4195,9 +4195,10 @@
 	ZERO_STRUCT(sbuf);
 
 	status = unix_convert(conn, newname, False, newname_last_component, &sbuf);
-	/* We expect this to be NT_STATUS_OBJECT_PATH_NOT_FOUND */
-	if (!NT_STATUS_EQUAL(NT_STATUS_OBJECT_PATH_NOT_FOUND, status)) {
-		return NT_STATUS_OBJECT_NAME_COLLISION;
+
+	/* If an error we expect this to be NT_STATUS_OBJECT_PATH_NOT_FOUND */
+
+	if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(NT_STATUS_OBJECT_PATH_NOT_FOUND, status)) {
 		return status;
 	}