Changeset 232 for branches/samba-3.2.x/source/smbd/nttrans.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/smbd/nttrans.c (modified) (2 diffs)

branches/samba-3.2.x/source/smbd/nttrans.c

@@ -1306 +1306 @@
         }
 
-        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);
@@ -1357 +1350 @@
                 }
                 reply_nterror(req, status);
+                END_PROFILE(SMBntrename);
+                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;