sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s3: VFS: default. Ensure read_dfs_pathat() returns stat info.

Browse Source 
Remove the knownfail.d/msdfs-attr file.

Everything now passes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14391

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Jun  3 06:19:21 UTC 2020 on sn-devel-184
This commit is contained in:
Jeremy Allison 2020-05-29 17:56:58 -07:00 committed by Ralph Boehme
parent 50cb3ef0ae
commit ab018150e6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
selftest/knownfail.d/msdfs-attr
View File

@ -1,3 +0,0 @@
samba3.smbtorture_s3.smb2.MSDFS-ATTRIBUTE
samba3.smbtorture_s3.smb1.MSDFS-ATTRIBUTE

14
source3/modules/vfs_default.c
View File

@ -434,9 +434,15 @@ static NTSTATUS vfswrap_read_dfs_pathat(struct vfs_handle_struct *handle,
#else #else
char link_target_buf[7]; char link_target_buf[7];
#endif #endif
int ret;
SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp); SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
if (is_named_stream(smb_fname)) {
status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
goto err;
}
if (ppreflist == NULL && preferral_count == NULL) { if (ppreflist == NULL && preferral_count == NULL) {
/* /*
* We're only checking if this is a DFS * We're only checking if this is a DFS
@ -485,6 +491,14 @@ static NTSTATUS vfswrap_read_dfs_pathat(struct vfs_handle_struct *handle,
goto err; goto err;
} }
ret = sys_lstat(smb_fname->base_name,
&smb_fname->st,
lp_fake_directory_create_times(SNUM(handle->conn)));
if (ret < 0) {
status = map_nt_error_from_unix(errno);
goto err;
}
if (ppreflist == NULL && preferral_count == NULL) { if (ppreflist == NULL && preferral_count == NULL) {
/* Early return for checking if this is a DFS link. */ /* Early return for checking if this is a DFS link. */
return NT_STATUS_OK; return NT_STATUS_OK;