diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 14:02:30 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 14:02:30 +0100 |
commit | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (patch) | |
tree | a286f235cbbbbaff06f83a32e55b0199da6dd8e4 /source3/smbd/nttrans.c | |
parent | ca05542d3defe76c3bce48eaff1fc749821a976c (diff) | |
parent | 21b7b000fb53ac3025d0038cc551a47f9d4a743b (diff) | |
download | samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.tar.gz samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.tar.bz2 samba-de7dc2cec059305d28cc75a5347bfd88f3cb5c95.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/nttrans.c')
-rw-r--r-- | source3/smbd/nttrans.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index b17aec80fa..3f33237f18 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1310,13 +1310,6 @@ void reply_ntrename(struct smb_request *req) return; } - if( is_ntfs_stream_name(oldname)) { - /* Can't rename a stream. */ - reply_nterror(req, NT_STATUS_ACCESS_DENIED); - END_PROFILE(SMBntrename); - return; - } - if (ms_has_wild(oldname)) { reply_nterror(req, NT_STATUS_OBJECT_PATH_SYNTAX_BAD); END_PROFILE(SMBntrename); @@ -1364,6 +1357,13 @@ void reply_ntrename(struct smb_request *req) return; } + /* The new name must begin with a ':' if the old name is a stream. */ + if (is_ntfs_stream_name(oldname) && (newname[0] != ':')) { + reply_nterror(req, NT_STATUS_INVALID_PARAMETER); + END_PROFILE(SMBntrename); + return; + } + DEBUG(3,("reply_ntrename : %s -> %s\n",oldname,newname)); switch(rename_type) { |