Tidy up treatment of ctime.

Jeremy.

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index bd0c7df95974a3cc0427276d160fde063074aae5..535532d07ad2c7c228dfe3343615423089940270 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -760,6 +760,8 @@ int file_ntimes(connection_struct *conn, const struct smb_filename *smb_fname,
                  time_to_asc(convert_timespec_to_time_t(ft->atime))));
        DEBUG(6, ("file_ntime: modtime: %s",
                  time_to_asc(convert_timespec_to_time_t(ft->mtime))));
+       DEBUG(6, ("file_ntime: ctime: %s",
+                 time_to_asc(convert_timespec_to_time_t(ft->ctime))));
        DEBUG(6, ("file_ntime: createtime: %s",
                  time_to_asc(convert_timespec_to_time_t(ft->create_time))));
 

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 8cbd259f634d23e89d19f4b25263a5ce62e2c3d7..0daaf7c901082baad126699ab9ecb6d5b638948b 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5209,7 +5209,9 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
                set_createtime = true;
        }
 
-       if (!null_timespec(ft->ctime)) {
+       if (null_timespec(ft->ctime)) {
+               ft->ctime = smb_fname->st.st_ex_ctime;
+       } else {
                set_ctime = true;
        }
 
@@ -5232,10 +5234,10 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
                time_to_asc(convert_timespec_to_time_t(ft->atime))));
        DEBUG(5,("smb_set_filetime: modtime: %s\n ",
                time_to_asc(convert_timespec_to_time_t(ft->mtime))));
-       if (!null_timespec(ft->create_time)) {
-               DEBUG(5,("smb_set_file_time: createtime: %s\n ",
-                  time_to_asc(convert_timespec_to_time_t(ft->create_time))));
-       }
+       DEBUG(5,("smb_set_filetime: ctime: %s\n ",
+               time_to_asc(convert_timespec_to_time_t(ft->ctime))));
+       DEBUG(5,("smb_set_file_time: createtime: %s\n ",
+               time_to_asc(convert_timespec_to_time_t(ft->create_time))));
 
        /*
         * Try and set the times of this file if