svn commit: samba r23088 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_25/source/smbd SAMBA_3_0_26/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-05-22 23:56:47 +0000 (Tue, 22 May 2007)
New Revision: 23088

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

Log:
Fix rename for cifsfs client. This may be needed for
3.0.25a.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0_25/source/smbd/reply.c
   branches/SAMBA_3_0_26/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-05-22 22:35:13 UTC (rev 23087)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-05-22 23:56:47 UTC (rev 23088)
@@ -4310,10 +4310,10 @@
 		return NT_STATUS_OBJECT_NAME_COLLISION;
 	}
 
-	status = can_rename(conn,newname,attrs,&sbuf);
+	status = can_rename(conn,fsp->fsp_name,attrs,&sbuf);
 
 	if (dest_exists && !NT_STATUS_IS_OK(status)) {
-		DEBUG(3,("rename_internals: Error %s rename %s -> %s\n",
+		DEBUG(3,("rename_internals_fsp: Error %s rename %s -> %s\n",
 			nt_errstr(status), fsp->fsp_name,newname));
 		if (NT_STATUS_EQUAL(status,NT_STATUS_SHARING_VIOLATION))
 			status = NT_STATUS_ACCESS_DENIED;

Modified: branches/SAMBA_3_0_25/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/reply.c	2007-05-22 22:35:13 UTC (rev 23087)
+++ branches/SAMBA_3_0_25/source/smbd/reply.c	2007-05-22 23:56:47 UTC (rev 23088)
@@ -4260,10 +4260,10 @@
 		return NT_STATUS_OBJECT_NAME_COLLISION;
 	}
 
-	status = can_rename(conn,newname,attrs,&sbuf);
+	status = can_rename(conn,fsp->fsp_name,attrs,&sbuf);
 
 	if (dest_exists && !NT_STATUS_IS_OK(status)) {
-		DEBUG(3,("rename_internals: Error %s rename %s -> %s\n",
+		DEBUG(3,("rename_internals_fsp: Error %s rename %s -> %s\n",
 			nt_errstr(status), fsp->fsp_name,newname));
 		if (NT_STATUS_EQUAL(status,NT_STATUS_SHARING_VIOLATION))
 			status = NT_STATUS_ACCESS_DENIED;

Modified: branches/SAMBA_3_0_26/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/reply.c	2007-05-22 22:35:13 UTC (rev 23087)
+++ branches/SAMBA_3_0_26/source/smbd/reply.c	2007-05-22 23:56:47 UTC (rev 23088)
@@ -4308,10 +4308,10 @@
 		return NT_STATUS_OBJECT_NAME_COLLISION;
 	}
 
-	status = can_rename(conn,newname,attrs,&sbuf);
+	status = can_rename(conn,fsp->fsp_name,attrs,&sbuf);
 
 	if (dest_exists && !NT_STATUS_IS_OK(status)) {
-		DEBUG(3,("rename_internals: Error %s rename %s -> %s\n",
+		DEBUG(3,("rename_internals_fsp: Error %s rename %s -> %s\n",
 			nt_errstr(status), fsp->fsp_name,newname));
 		if (NT_STATUS_EQUAL(status,NT_STATUS_SHARING_VIOLATION))
 			status = NT_STATUS_ACCESS_DENIED;