diff options
| author | Volker Lendecke <vl@samba.org> | 2023-04-14 17:22:18 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2023-04-17 18:11:07 +0000 |
| commit | 526f381f413d1cb5cde93b9542034f5ebfcfcc10 (patch) | |
| tree | 328065bf406a14165a2c645fb762da8a39327b06 | |
| parent | 0327334c89cfda9020c6044a7b2b182138e46d03 (diff) | |
| download | samba-526f381f413d1cb5cde93b9542034f5ebfcfcc10.tar.gz | |
shadow_copy2: Fix stream open for streams_depot paths
streams_depot hands us absolute paths with : filename components
instead of having set smb_fname_in->stream_name.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15358
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Apr 17 18:11:07 UTC 2023 on atb-devel-224
| -rw-r--r-- | selftest/knownfail.d/shadow_depot | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_shadow_copy2.c | 25 |
2 files changed, 16 insertions, 10 deletions
diff --git a/selftest/knownfail.d/shadow_depot b/selftest/knownfail.d/shadow_depot deleted file mode 100644 index 0dbf553a9ef..00000000000 --- a/selftest/knownfail.d/shadow_depot +++ /dev/null @@ -1 +0,0 @@ -^samba.tests.libsmb-basic.samba.tests.libsmb-basic.LibsmbTestCase.test_libsmb_shadow_depot\(fileserver_smb1\) diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 16e39c2f070..a2c9d3ce4c9 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -1522,15 +1522,22 @@ static struct smb_filename *shadow_copy2_openat_name( if (fsp->base_fsp != NULL) { struct smb_filename *base_fname = fsp->base_fsp->fsp_name; - SMB_ASSERT(is_named_stream(smb_fname_in)); - - result = synthetic_smb_fname( - mem_ctx, - base_fname->base_name, - smb_fname_in->stream_name, - &smb_fname_in->st, - smb_fname_in->twrp, - smb_fname_in->flags); + if (smb_fname_in->base_name[0] == '/') { + /* + * Special-case stream names from streams_depot + */ + result = cp_smb_filename(mem_ctx, smb_fname_in); + } else { + + SMB_ASSERT(is_named_stream(smb_fname_in)); + + result = synthetic_smb_fname(mem_ctx, + base_fname->base_name, + smb_fname_in->stream_name, + &smb_fname_in->st, + smb_fname_in->twrp, + smb_fname_in->flags); + } } else { result = full_path_from_dirfsp_atname( mem_ctx, dirfsp, smb_fname_in); |