Changeset 790 for branches/samba-3.3.x/source

Timestamp:

Aug 16, 2013, 10:25:41 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.3: fix for ticket #165

File:

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

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

@@ -4961 +4961 @@
                 }
         }
-#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"));
 
@@ -4974 +4968 @@
 
         if(file_ntimes(conn, fname, ts)!=0) {
+#ifdef __OS2__
+        // final fix for ticket #60 and ticket #165
+                if (!setting_write_time)
+#endif
                 return map_nt_error_from_unix(errno);
         }
-#ifdef __OS2__
-        }
-#endif
+
         notify_fname(conn, NOTIFY_ACTION_MODIFIED, action, fname);