svn commit: samba r23092 - in branches/SAMBA_3_0_RELEASE: . source/smbd source/tdb/tools

[jerry at samba.org]

Author: jerry
Date: 2007-05-23 15:28:47 +0000 (Wed, 23 May 2007)
New Revision: 23092

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

Log:
Merge Herb's changes to tdbtool and Jeremy's fox 
for renames with the cifs fs client.



Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/smbd/reply.c
   branches/SAMBA_3_0_RELEASE/source/tdb/tools/tdbtool.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2007-05-23 15:17:49 UTC (rev 23091)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2007-05-23 15:28:47 UTC (rev 23092)
@@ -54,6 +54,7 @@
       about that we retry the lock every 10 seconds instead of waiting
       for the standard select timeout.
     * BUG 4637: Fix samlogon reply regression that broke domain logons.
+    * Fix rename for Linux cifs fs client.
 
 
 o   Alexander Bokovoy <ab at samba.org>
@@ -85,6 +86,11 @@
       uninitialized variables.
 
 
+o   Herb Lewis <herb at samba.org>
+    * Update connection structure definition for tdbtool display
+      output.
+
+
 o   Derrell Lipman <derrell at samba.org>
     * BUG 4601: Fix smbc_getxattr() to properly return the required
       size of the buffer needed to contain the extended attributes.

Modified: branches/SAMBA_3_0_RELEASE/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/reply.c	2007-05-23 15:17:49 UTC (rev 23091)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/reply.c	2007-05-23 15:28:47 UTC (rev 23092)
@@ -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_RELEASE/source/tdb/tools/tdbtool.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/tdb/tools/tdbtool.c	2007-05-23 15:17:49 UTC (rev 23091)
+++ branches/SAMBA_3_0_RELEASE/source/tdb/tools/tdbtool.c	2007-05-23 15:28:47 UTC (rev 23092)
@@ -116,7 +116,7 @@
 	int cnum;
 	uid_t uid;
 	gid_t gid;
-	char name[24];
+	char servicename[FSTRING_LEN];
 	char addr[24];
 	char machine[FSTRING_LEN];
 	time_t start;
@@ -373,7 +373,7 @@
 	printf( "\ndata %d bytes\n", (int)dbuf.dsize);
 	printf( "pid    =%5d   ", ((connections_data*)dbuf.dptr)->pid);
 	printf( "cnum   =%10d  ", ((connections_data*)dbuf.dptr)->cnum);
-	printf( "name   =[%s]\n", ((connections_data*)dbuf.dptr)->name);
+	printf( "name   =[%s]\n", ((connections_data*)dbuf.dptr)->servicename);
 	
 	printf( "uid    =%5d   ",  ((connections_data*)dbuf.dptr)->uid);
 	printf( "addr   =[%s]\n", ((connections_data*)dbuf.dptr)->addr);