Changeset 228 for branches/samba-3.2.x/source/smbd/reply.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/smbd/reply.c (modified) (9 diffs)

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

@@ -55 +55 @@
         NTSTATUS ret = NT_STATUS_OK;
         bool start_of_name_component = True;
+        bool stream_started = false;
 
         *p_last_component_contains_wcard = False;
 
         while (*s) {
-                if (IS_PATH_SEP(*s,posix_path)) {
+                if (stream_started) {
+                        switch (*s) {
+                        case '/':
+                        case '\\':
+                                return NT_STATUS_OBJECT_NAME_INVALID;
+                        case ':':
+                                if (s[1] == '\0') {
+                                        return NT_STATUS_OBJECT_NAME_INVALID;
+                                }
+                                if (strchr_m(&s[1], ':')) {
+                                        return NT_STATUS_OBJECT_NAME_INVALID;
+                                }
+                                if (StrCaseCmp(s, ":$DATA") != 0) {
+                                        return NT_STATUS_INVALID_PARAMETER;
+                                }
+                                break;
+                        }
+                }
+
+                if (!stream_started && *s == ':') {
+                        if (*p_last_component_contains_wcard) {
+                                return NT_STATUS_OBJECT_NAME_INVALID;
+                        }
+                        /* stream names allow more characters than file names */
+                        stream_started = true;
+                        start_of_name_component = false;
+                        posix_path = true;
+
+                        if (s[1] == '\0') {
+                                return NT_STATUS_OBJECT_NAME_INVALID;
+                        }
+                }
+
+                if (!stream_started && IS_PATH_SEP(*s,posix_path)) {
                         /*
                          * Safe to assume is not the second part of a mb char
@@ -122 +156 @@
                 if (!(*s & 0x80)) {
                         if (!posix_path) {
-                                if (*s <= 0x1f) {
+                                if (*s <= 0x1f || *s == '|') {
                                         return NT_STATUS_OBJECT_NAME_INVALID;
                                 }
@@ -4600 +4634 @@
         files_struct *fsp;
         NTSTATUS status;
-        
+
         START_PROFILE(SMBsplopen);
 
@@ -4615 +4649 @@
         }
 
-        /* Open for exclusive use, write only. */
-        status = print_fsp_open(conn, NULL, &fsp);
-
-        if (!NT_STATUS_IS_OK(status)) {
+        status = file_new(conn, &fsp);
+        if(!NT_STATUS_IS_OK(status)) {
                 reply_nterror(req, status);
                 END_PROFILE(SMBsplopen);
@@ -4624 +4656 @@
         }
 
+        /* Open for exclusive use, write only. */
+        status = print_fsp_open(conn, NULL, fsp);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                file_free(fsp);
+                reply_nterror(req, status);
+                END_PROFILE(SMBsplopen);
+                return;
+        }
+
         reply_outbuf(req, 1, 0);
         SSVAL(req->outbuf,smb_vwv0,fsp->fnum);
-  
+
         DEBUG(3,("openprint fd=%d fnum=%d\n",
                  fsp->fh->fd, fsp->fnum));
@@ -5047 +5089 @@
                 }
 
-                /* We only have veto files/directories. Recursive delete. */
-
+                /* We only have veto files/directories.
+                 * Are we allowed to delete them ? */
+
+                if(!lp_recursive_veto_delete(SNUM(conn))) {
+                        TALLOC_FREE(dir_hnd);
+                        errno = ENOTEMPTY;
+                        goto err;
+                }
+
+                /* Do a recursive delete. */
                 RewindDir(dir_hnd,&dirpos);
                 while ((dname = ReadDirName(dir_hnd,&dirpos))) {
@@ -5074 +5124 @@
                         }
                         if(st.st_mode & S_IFDIR) {
-                                if(lp_recursive_veto_delete(SNUM(conn))) {
-                                        if(!recursive_rmdir(ctx, conn, fullname))
-                                                break;
+                                if(!recursive_rmdir(ctx, conn, fullname)) {
+                                        break;
                                 }
                                 if(SMB_VFS_RMDIR(conn,fullname) != 0) {
@@ -5507 +5556 @@
         }
 
+        if(replace_if_exists && dst_exists) {
+                if (is_ntfs_stream_name(newname)) {
+                        return NT_STATUS_INVALID_PARAMETER;
+                }
+        }
+
         if (dst_exists) {
                 struct file_id fileid = vfs_file_id_from_sbuf(conn, &sbuf1);
@@ -5557 +5612 @@
                         fsp->fsp_name,newname));
 
+                notify_rename(conn, fsp->is_directory, fsp->fsp_name, newname);
+
                 rename_open_files(conn, lck, newname);
-
-                notify_rename(conn, fsp->is_directory, fsp->fsp_name, newname);
 
                 /*