Changeset 228 for branches/samba-3.2.x/source/smbd/trans2.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/trans2.c (modified) (11 diffs)

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

@@ -1092 +1092 @@
         if (mask[0] == '.' && mask[1] == 0)
                 return False;
+        if (dptr_has_wild(conn->dirptr)) {
+                return False;
+        }
         if (conn->case_sensitive)
                 return strcmp(str,mask)==0;
-        if (StrCaseCmp(str,mask) != 0) {
-                return False;
-        }
-        if (dptr_has_wild(conn->dirptr)) {
-                return False;
-        }
-        return True;
+        else
+                return StrCaseCmp(str,mask) == 0;
 }
 
@@ -1134 +1132 @@
 #endif
 
-        DEBUG(0,("unix_filetype: unknown filetype %u", (unsigned)mode));
+        DEBUG(0,("unix_filetype: unknown filetype %u\n", (unsigned)mode));
         return UNIX_TYPE_UNKNOWN;
 }
@@ -1897 +1895 @@
         int info_level;
         char *directory = NULL;
-        const char *mask = NULL;
+        char *mask = NULL;
         char *p;
         int last_entry_off=0;
@@ -1985 +1983 @@
         }
 
-        ntstatus = unix_convert(ctx, conn, directory, True, &directory, NULL, &sbuf);
+        ntstatus = unix_convert(ctx, conn, directory, True, &directory, &mask, &sbuf);
         if (!NT_STATUS_IS_OK(ntstatus)) {
                 reply_nterror(req, ntstatus);
@@ -2001 +1999 @@
                 /* Windows and OS/2 systems treat search on the root '\' as if it were '\*' */
                 if((directory[0] == '.') && (directory[1] == '\0')) {
-                        mask = "*";
+                        mask = talloc_strdup(ctx,"*");
+                        if (!mask) {
+                                reply_nterror(req, NT_STATUS_NO_MEMORY);
+                                return;
+                        }
                         mask_contains_wcard = True;
-                } else {
-                        mask = directory;
                 }
                 directory = talloc_strdup(talloc_tos(), "./");
@@ -2012 +2012 @@
                 }
         } else {
-                mask = p+1;
                 *p = 0;
         }
@@ -3990 +3989 @@
                 }
 
+                if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
+                    && is_ntfs_stream_name(fname)) {
+                        char *base;
+                        SMB_STRUCT_STAT bsbuf;
+
+                        status = split_ntfs_stream_name(talloc_tos(), fname,
+                                                        &base, NULL);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                DEBUG(10, ("create_file_unixpath: "
+                                        "split_ntfs_stream_name failed: %s\n",
+                                        nt_errstr(status)));
+                                reply_nterror(req, status);
+                                return;
+                        }
+
+                        SMB_ASSERT(!is_ntfs_stream_name(base)); /* paranoia.. */
+
+                        if (INFO_LEVEL_IS_UNIX(info_level)) {
+                                /* Always do lstat for UNIX calls. */
+                                if (SMB_VFS_LSTAT(conn,base,&bsbuf)) {
+                                        DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",base,strerror(errno)));
+                                        reply_unixerror(req,ERRDOS,ERRbadpath);
+                                        return;
+                                }
+                        } else {
+                                if (SMB_VFS_STAT(conn,base,&bsbuf) != 0) {
+                                        DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",base,strerror(errno)));
+                                        reply_unixerror(req,ERRDOS,ERRbadpath);
+                                        return;
+                                }
+                        }
+
+                        fileid = vfs_file_id_from_sbuf(conn, &bsbuf);
+                        get_file_infos(fileid, &delete_pending, NULL);
+                        if (delete_pending) {
+                                reply_nterror(req, NT_STATUS_DELETE_PENDING);
+                                return;
+                        }
+                }
+
                 if (INFO_LEVEL_IS_UNIX(info_level)) {
                         /* Always do lstat for UNIX calls. */
@@ -4903 +4942 @@
 
                 if (fsp != NULL) {
-                        set_sticky_write_time_fsp(fsp, ts[1]);
+                        if (fsp->base_fsp) {
+                                set_sticky_write_time_fsp(fsp->base_fsp, ts[1]);
+                        } else {
+                                set_sticky_write_time_fsp(fsp, ts[1]);
+                        }
                 } else {
                         set_sticky_write_time_path(conn, fname,
@@ -4917 +4960 @@
 #endif
         DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
+
+        if (fsp && fsp->base_fsp) {
+                fname = fsp->base_fsp->fsp_name;
+        }
 
         if(file_ntimes(conn, fname, ts)!=0) {
@@ -5346 +5393 @@
         }
 
-        /* Create the base directory. */
-        base_name = talloc_strdup(ctx, fname);
-        if (!base_name) {
-                return NT_STATUS_NO_MEMORY;
-        }
-        p = strrchr_m(base_name, '/');
-        if (p) {
-                p[1] = '\0';
-        } else {
-                base_name = talloc_strdup(ctx, "./");
+        if (fsp && fsp->base_fsp) {
+                if (newname[0] != ':') {
+                        return NT_STATUS_NOT_SUPPORTED;
+                }
+                base_name = talloc_asprintf(ctx, "%s%s",
+                                           fsp->base_fsp->fsp_name,
+                                           newname);
                 if (!base_name) {
                         return NT_STATUS_NO_MEMORY;
                 }
-        }
-        /* Append the new name. */
-        base_name = talloc_asprintf_append(base_name,
-                        "%s",
-                        newname);
-        if (!base_name) {
-                return NT_STATUS_NO_MEMORY;
+        } else {
+                if (is_ntfs_stream_name(newname)) {
+                        return NT_STATUS_NOT_SUPPORTED;
+                }
+
+                /* Create the base directory. */
+                base_name = talloc_strdup(ctx, fname);
+                if (!base_name) {
+                        return NT_STATUS_NO_MEMORY;
+                }
+                p = strrchr_m(base_name, '/');
+                if (p) {
+                        p[1] = '\0';
+                } else {
+                        base_name = talloc_strdup(ctx, "./");
+                        if (!base_name) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                }
+                /* Append the new name. */
+                base_name = talloc_asprintf_append(base_name,
+                                "%s",
+                                newname);
+                if (!base_name) {
+                        return NT_STATUS_NO_MEMORY;
+                }
         }
 
@@ -7067 +7130 @@
                         return;
                 }
-        } else if (IVAL(pdata,0) != 4) {
-                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                return;
-        }
+        }
+        /* If total_data == 4 Windows doesn't care what values
+         * are placed in that field, it just ignores them.
+         * The System i QNTC IBM SMB client puts bad values here,
+         * so ignore them. */
 
         status = create_directory(conn, req, directory);