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/reply.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/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 4 |
1 files changed, 3 insertions, 1 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; } } |