Changeset 154

Timestamp:

08/21/08 10:39:38 (3 months ago)

Author:

ydario

Message:

If a pending time is stored, do not change also the file. Fixes ticket:60.

Files:

• branches/samba-3.0/source/smbd/trans2.c (modified) (2 diffs)
• trunk/samba/source/smbd/trans2.c (modified) (2 diffs)

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

@@ -4162 +4162 @@
                         fsp_set_pending_modtime(fsp, ts[1]);
                 }
-
-        }
+        }
+#ifdef __OS2__
+        /* YD ticket#60, the file is opened, we cannot write to it,
+         * so we can return immediately (see above for more comments).
+         */
+        else {
+#endif
         DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
@@ -4169 +4174 @@
                 return map_nt_error_from_unix(errno);
         }
+#ifdef __OS2__
+        }
+#endif
         if (action != 0) {
                 notify_fname(conn, NOTIFY_ACTION_MODIFIED, action, fname);

trunk/samba/source/smbd/trans2.c

@@ -4903 +4903 @@
                 }
         }
-
+#ifdef __OS2__
+        /* YD ticket#60, the file is opened, we cannot write to it,
+         * so we can return immediately (see above for more comments).
+         */
+        else {
+#endif
         DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
@@ -4909 +4914 @@
                 return map_nt_error_from_unix(errno);
         }
+#ifdef __OS2__
+        }
+#endif
         notify_fname(conn, NOTIFY_ACTION_MODIFIED, action, fname);