Changeset 124 for branches/samba-3.0/source/smbd/dosmode.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/smbd/dosmode.c (modified) (4 diffs)

branches/samba-3.0/source/smbd/dosmode.c

@@ -453 +453 @@
 
         DEBUG(10,("file_set_dosmode: setting dos mode 0x%x on file %s\n", dosmode, fname));
-        if (!st || (st && !VALID_STAT(*st))) {
+
+        if (st == NULL) {
+                SET_STAT_INVALID(st1);
                 st = &st1;
+        }
+
+        if (!VALID_STAT(*st)) {
                 if (SMB_VFS_STAT(conn,fname,st))
                         return(-1);
         }
+
+        unixmode = st->st_mode;
 
         get_acl_group_bits(conn, fname, &st->st_mode);
@@ -466 +473 @@
                 dosmode &= ~aDIR;
 
-        if (dos_mode(conn,fname,st) == dosmode)
+        if (dos_mode(conn,fname,st) == dosmode) {
+                st->st_mode = unixmode;
                 return(0);
+        }
 
         /* Store the DOS attributes in an EA by preference. */
         if (set_ea_dos_attribute(conn, fname, st, dosmode)) {
+                st->st_mode = unixmode;
                 return 0;
         }
@@ -509 +519 @@
                 notify_fname(conn, NOTIFY_ACTION_MODIFIED,
                              FILE_NOTIFY_CHANGE_ATTRIBUTES, fname);
+                st->st_mode = unixmode;
                 return 0;
         }
@@ -541 +552 @@
                 notify_fname(conn, NOTIFY_ACTION_MODIFIED,
                              FILE_NOTIFY_CHANGE_ATTRIBUTES, fname);
+                if (ret == 0) {
+                        st->st_mode = unixmode;
+                }
         }