diff options
| author | Ralph Boehme <slow@samba.org> | 2019-09-24 12:49:38 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-10-16 19:25:13 +0000 |
| commit | f98033600613e1c26d233063a99d2a7f7207a74f (patch) | |
| tree | 0317c529da228c587c932f9ea3fcfc3ea37f17ed | |
| parent | 8f44a25e2a630a28d908392603eae5987ec4e91e (diff) | |
| download | samba-f98033600613e1c26d233063a99d2a7f7207a74f.tar.gz | |
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>
(cherry picked from commit 90a14c90c4bcede1ef5414e0800aa4c84cbcf1c9)
| -rw-r--r-- | selftest/knownfail.d/samba3.smb2.fileid | 1 | ||||
| -rw-r--r-- | source3/smbd/open.c | 2 |
2 files changed, 1 insertions, 2 deletions
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 7f1f8eae593..8586b467d2e 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3708,7 +3708,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)) && |