diff options
| -rw-r--r-- | source3/modules/vfs_default.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 9cca349413..698e745d59 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -786,7 +786,11 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, } else { 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]; tv[0] = convert_timespec_to_timeval(ft->atime); @@ -795,7 +799,11 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, } else { 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; times.actime = convert_timespec_to_time_t(ft->atime); @@ -804,10 +812,12 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, } else { result = utime(smb_fname->base_name, NULL); } -#else + if (!((result == -1) && (errno == ENOSYS))) { + goto out; + } +#endif errno = ENOSYS; result = -1; -#endif out: END_PROFILE(syscall_ntimes); |