Changeset 222 for branches/samba-3.3.x/source/smbd/trans2.c

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

File:

• branches/samba-3.3.x/source/smbd/trans2.c (modified) (4 diffs)

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

@@ -4990 +4990 @@
 
 static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
+                                files_struct *fsp,
                                 const char *fname,
                                 SMB_STRUCT_STAT *psbuf,
@@ -4998 +4999 @@
         }
 
+        if (fsp) {
+                if (fsp->base_fsp) {
+                        fname = fsp->base_fsp->fsp_name;
+                } else {
+                        fname = fsp->fsp_name;
+                }
+        }
+                
         if (dosmode) {
                 if (S_ISDIR(psbuf->st_mode)) {
@@ -5723 +5732 @@
         dosmode = IVAL(pdata,32);
         status = smb_set_file_dosmode(conn,
-                                        fname,
-                                        psbuf,
-                                        dosmode);
+                                fsp,
+                                fname,
+                                psbuf,
+                                dosmode);
+
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -6390 +6401 @@
         } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) {
                 create_disp = FILE_OPEN_IF;
+        } else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) {
+                create_disp = FILE_OPEN;
         } else {
                 DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n",