diff options
| author | Jeremy Allison <jra@samba.org> | 2008-12-19 13:59:12 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-12-19 13:59:12 -0800 |
| commit | 6eda98dd13ebf7083da3075252ac11e4d3298b76 (patch) | |
| tree | 757fd2fa66a1bea3238164f8d6b5c66570ac7b24 | |
| parent | ae1d6020f0a6565959287c229fb7ecd7f5f40231 (diff) | |
| download | samba-6eda98dd13ebf7083da3075252ac11e4d3298b76.tar.gz samba-6eda98dd13ebf7083da3075252ac11e4d3298b76.tar.bz2 samba-6eda98dd13ebf7083da3075252ac11e4d3298b76.zip | |
Fix bug #5986 - Editing a stream is broken (rename problems).
Jeremy.
| -rw-r--r-- | source3/smbd/reply.c | 4 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 9f7a1896b8..b8be3ed304 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -5515,7 +5515,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, } if(replace_if_exists && dst_exists) { - if (is_ntfs_stream_name(newname)) { + /* Ensure both or neither are stream names. */ + if (is_ntfs_stream_name(fsp->fsp_name) != + is_ntfs_stream_name(newname)) { return NT_STATUS_INVALID_PARAMETER; } } 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, |