Changeset 596 for trunk/server/source3/modules/vfs_default.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/modules/vfs_default.c (modified) (4 diffs)

trunk/server/source3/modules/vfs_default.c

@@ -218 +218 @@
             && parent_dirname(talloc_tos(), path, &parent, NULL)
             && (has_dacl = directory_has_default_acl(handle->conn, parent)))
-                mode = 0777;
+                mode = (0777 & lp_dir_mask(SNUM(handle->conn)));
 
         TALLOC_FREE(parent);
@@ -899 +899 @@
                 result = utimensat(AT_FDCWD, smb_fname->base_name, NULL, 0);
         }
-#elif defined(HAVE_UTIMES)
+        if (!((result == -1) && (errno == ENOSYS))) {
+                goto out;
+        }
+#endif
+#if defined(HAVE_UTIMES)
         if (ft != NULL) {
                 struct timeval tv[2];
@@ -908 +912 @@
                 result = utimes(smb_fname->base_name, NULL);
         }
-#elif defined(HAVE_UTIME)
+        if (!((result == -1) && (errno == ENOSYS))) {
+                goto out;
+        }
+#endif
+#if defined(HAVE_UTIME)
         if (ft != NULL) {
                 struct utimbuf times;
@@ -917 +925 @@
                 result = utime(smb_fname->base_name, NULL);
         }
-#else
+        if (!((result == -1) && (errno == ENOSYS))) {
+                goto out;
+        }
+#endif
         errno = ENOSYS;
         result = -1;
-#endif
 
  out: