diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-23 15:28:47 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-05-23 15:28:47 +0000 |
| commit | a7385f33bf7d7efc9bea78caeca94c43e5670749 (patch) | |
| tree | ce97372e4eda49f3b219bf817c4e4b3ffdcffbb0 | |
| parent | 7eb61aedbd729cd91a84c958c3abf2ddb9c77915 (diff) | |
| download | samba-a7385f33bf7d7efc9bea78caeca94c43e5670749.tar.gz | |
r23092: Merge Herb's changes to tdbtool and Jeremy's fox
for renames with the cifs fs client.
| -rw-r--r-- | WHATSNEW.txt | 6 | ||||
| -rw-r--r-- | source/smbd/reply.c | 4 | ||||
| -rw-r--r-- | source/tdb/tools/tdbtool.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index a93358a47db..0e6cdb58b2c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -54,6 +54,7 @@ o Jeremy Allison <jra@samba.org> 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@samba.org> @@ -85,6 +86,11 @@ o Volker Lendecke <vl@samba.org> uninitialized variables. +o Herb Lewis <herb@samba.org> + * Update connection structure definition for tdbtool display + output. + + o Derrell Lipman <derrell@samba.org> * BUG 4601: Fix smbc_getxattr() to properly return the required size of the buffer needed to contain the extended attributes. diff --git a/source/smbd/reply.c b/source/smbd/reply.c index 37a49756e38..bb4965adf6a 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -4260,10 +4260,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, pstrin 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; diff --git a/source/tdb/tools/tdbtool.c b/source/tdb/tools/tdbtool.c index bcfb96adc09..2f549ef91b9 100644 --- a/source/tdb/tools/tdbtool.c +++ b/source/tdb/tools/tdbtool.c @@ -116,7 +116,7 @@ typedef struct connections_data { 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 @@ static int print_conn_data(TDB_DATA dbuf) 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); |