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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/knownfail.d/samba3.smb2.fileid b/selftest/knownfail.d/samba3.smb2.fileid
deleted file mode 100644 (file)
index 89455da..0000000
--- 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 061f16a0ebefa3158b048b66d064099d9065f855..e9c332e3e8c9ca6358456d09debd8a7407fbc420 100644 (file)
--- 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)) &&