From: Jeremy Allison <jra@samba.org>
Date: Thu, 6 Aug 2009 19:50:16 +0000 (-0700)
Subject: Put SMB_INFO_STANDARD back into setfileinfo, but do it right
X-Git-Tag: talloc-2.0.0~464^2~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e76af514c3a99a6c65398a9d7a99012ff73583eb;p=thirdparty%2Fsamba.git

Put SMB_INFO_STANDARD back into setfileinfo, but do it right
this time :-).
Jeremy.
---

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 184a8580970..21c5062257f 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6109,6 +6109,41 @@ static NTSTATUS smb_set_file_basic_info(connection_struct *conn,
 				 true);
 }
 
+/****************************************************************************
+ Deal with SMB_INFO_STANDARD.
+****************************************************************************/
+
+static NTSTATUS smb_set_info_standard(connection_struct *conn,
+					const char *pdata,
+					int total_data,
+					files_struct *fsp,
+					const struct smb_filename *smb_fname)
+{
+	struct smb_file_time ft;
+
+	ZERO_STRUCT(ft);
+
+	if (total_data < 12) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	/* create time */
+	ft.create_time = convert_time_t_to_timespec(srv_make_unix_date2(pdata));
+	/* access time */
+	ft.atime = convert_time_t_to_timespec(srv_make_unix_date2(pdata+4));
+	/* write time */
+	ft.mtime = convert_time_t_to_timespec(srv_make_unix_date2(pdata+8));
+
+	DEBUG(10,("smb_set_info_standard: file %s\n",
+		smb_fname_str_dbg(smb_fname)));
+
+        return smb_set_file_time(conn,
+                                fsp,
+				smb_fname,
+				&ft,
+                                true);
+}
+
 /****************************************************************************
  Deal with SMB_SET_FILE_ALLOCATION_INFO.
 ****************************************************************************/
@@ -7086,6 +7121,16 @@ NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn,
 
 	switch (info_level) {
 
+		case SMB_INFO_STANDARD:
+		{
+			status = smb_set_info_standard(conn,
+					pdata,
+					total_data,
+					fsp,
+					smb_fname);
+			break;
+		}
+
 		case SMB_INFO_SET_EA:
 		{
 			status = smb_info_set_ea(conn,