diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:51:23 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:51:23 +0100 |
commit | 9617a3945b804bf2d1409285df2a7add12690063 (patch) | |
tree | b6506c7f5ed050900b511bbffb52df3544bda505 /source3/smbd/trans2.c | |
parent | 0898b96d26981d553e041a78721e32946bd4bddf (diff) | |
parent | d26a34c22f5d2685f8e75149f87db8d086e32e13 (diff) | |
download | samba-9617a3945b804bf2d1409285df2a7add12690063.tar.gz samba-9617a3945b804bf2d1409285df2a7add12690063.tar.bz2 samba-9617a3945b804bf2d1409285df2a7add12690063.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r-- | source3/smbd/trans2.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 606e656795..27e29515e4 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5372,6 +5372,8 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, char *newname = NULL; char *base_name = NULL; bool dest_has_wcard = False; + SMB_STRUCT_STAT sbuf; + char *newname_last_component = NULL; NTSTATUS status = NT_STATUS_OK; char *p; TALLOC_CTX *ctx = talloc_tos(); @@ -5380,6 +5382,8 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, return NT_STATUS_INVALID_PARAMETER; } + ZERO_STRUCT(sbuf); + overwrite = (CVAL(pdata,0) ? True : False); root_fid = IVAL(pdata,4); len = IVAL(pdata,8); @@ -5413,6 +5417,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, } if (fsp && fsp->base_fsp) { + /* newname must be a stream name. */ if (newname[0] != ':') { return NT_STATUS_NOT_SUPPORTED; } @@ -5423,6 +5428,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, return NT_STATUS_NO_MEMORY; } } else { + /* newname must *not* be a stream name. */ if (is_ntfs_stream_name(newname)) { return NT_STATUS_NOT_SUPPORTED; } @@ -5448,18 +5454,11 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, if (!base_name) { return NT_STATUS_NO_MEMORY; } - } - - if (fsp) { - SMB_STRUCT_STAT sbuf; - char *newname_last_component = NULL; - - ZERO_STRUCT(sbuf); status = unix_convert(ctx, conn, newname, False, - &newname, - &newname_last_component, - &sbuf); + &newname, + &newname_last_component, + &sbuf); /* If an error we expect this to be * NT_STATUS_OBJECT_PATH_NOT_FOUND */ @@ -5469,7 +5468,9 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, status)) { return status; } + } + if (fsp) { DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n", fsp->fnum, fsp->fsp_name, base_name )); status = rename_internals_fsp(conn, fsp, base_name, |