Ticket #61380: patch-fix-st_atim.diff

source3/libsmb/libsmb_stat.c

@@ -102 +102 @@
         }
 
         st->st_dev = dev;
-        st->st_atim = access_time_ts;
-        st->st_ctim = change_time_ts;
-        st->st_mtim = write_time_ts;
+        st->st_atimespec = access_time_ts;
+        st->st_ctimespec = change_time_ts;
+        st->st_mtimespec = write_time_ts;
 }
 
 void setup_stat_from_stat_ex(const struct stat_ex *stex,
                              const char *fname,
                              struct stat *st)
 {
-        st->st_atim = stex->st_ex_atime;
-        st->st_ctim = stex->st_ex_ctime;
-        st->st_mtim = stex->st_ex_mtime;
+        st->st_atimespec = stex->st_ex_atime;
+        st->st_ctimespec = stex->st_ex_ctime;
+        st->st_mtimespec = stex->st_ex_mtime;
 
         st->st_mode = stex->st_ex_mode;
         st->st_size = stex->st_ex_size;

source4/torture/libsmbclient/libsmbclient.c

@@ -1231 +1231 @@
         ret = smbc_fstat(fhandle, &st);
         torture_assert_int_not_equal(tctx, ret, -1, "smbc_fstat failed");
 
-        tbuf[0] = convert_timespec_to_timeval(st.st_atim);
-        tbuf[1] = convert_timespec_to_timeval(st.st_mtim);
+        tbuf[0] = convert_timespec_to_timeval(st.st_atimespec);
+        tbuf[1] = convert_timespec_to_timeval(st.st_mtimespec);
 
         tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */
 
@@ -1244 +1244 @@
 
         torture_assert_int_equal(
                 tctx,
-                st.st_mtim.tv_nsec / 1000,
+                st.st_mtimespec.tv_nsec / 1000,
                 tbuf[1].tv_usec,
                 "smbc_utimes did not update msec");