From: Ralph Boehme Date: Tue, 24 Sep 2019 19:49:38 +0000 (-0700) Subject: s3:smbd: ensure a created stream picks up the File-ID from the basefile X-Git-Tag: talloc-2.3.1~525 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90a14c90c4bcede1ef5414e0800aa4c84cbcf1c9;p=thirdparty%2Fsamba.git s3:smbd: ensure a created stream picks up the File-ID from the basefile BUG: https://bugzilla.samba.org/show_bug.cgi?id=14137 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- diff --git a/selftest/knownfail.d/samba3.smb2.fileid b/selftest/knownfail.d/samba3.smb2.fileid deleted file mode 100644 index 89455dacdf0..00000000000 --- a/selftest/knownfail.d/samba3.smb2.fileid +++ /dev/null @@ -1 +0,0 @@ -^samba3.smb2.fileid.fileid\(nt4_dc\) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 061f16a0ebe..e9c332e3e8c 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3936,7 +3936,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, fsp->initial_delete_on_close = True; } - if (info == FILE_WAS_CREATED) { + if (info == FILE_WAS_CREATED && !is_named_stream(smb_fname)) { smb_fname->st.st_ex_iflags &= ~ST_EX_IFLAG_CALCULATED_ITIME; if (lp_store_dos_attributes(SNUM(conn)) &&