diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-08-18 11:34:54 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-08-27 16:45:40 +0200 |
| commit | 09fe57923ab5570aad106b6b82faabe3fcd130fd (patch) | |
| tree | 07c175e1a489e337fe167bd3bc02371ccbee7db4 /source3/modules | |
| parent | e91d5dbed05f364d155ff8b91ddf5af718fb1462 (diff) | |
| download | samba-09fe57923ab5570aad106b6b82faabe3fcd130fd.tar.gz samba-09fe57923ab5570aad106b6b82faabe3fcd130fd.tar.bz2 samba-09fe57923ab5570aad106b6b82faabe3fcd130fd.zip | |
s3:streams: check for :$DATA only in the backend (fix bug #6642)
We need to allow "\\$Extend\\$Quota:$Q:$INDEX_ALLOCATION" to pass
check_path(), so that the Quota Dialog works.
metze
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_streams.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_streams_depot.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c index 66eda57a34..da2666130c 100644 --- a/source3/modules/onefs_streams.c +++ b/source3/modules/onefs_streams.c @@ -55,6 +55,9 @@ NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx, /* Strip off the :$DATA if one exists. */ str_tmp = strrchr_m(stream_name, ':'); if (str_tmp) { + if (StrCaseCmp(str_tmp, ":$DATA") != 0) { + return NT_STATUS_INVALID_PARAMETER; + } str_tmp[0] = '\0'; } } diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c index d09255a4a2..aa0189123b 100644 --- a/source3/modules/vfs_streams_depot.c +++ b/source3/modules/vfs_streams_depot.c @@ -321,6 +321,14 @@ static NTSTATUS stream_smb_fname(vfs_handle_struct *handle, *smb_fname_out = NULL; + stype = strchr_m(smb_fname->stream_name + 1, ':'); + + if (stype) { + if (StrCaseCmp(stype, ":$DATA") != 0) { + return NT_STATUS_INVALID_PARAMETER; + } + } + dirname = stream_dir(handle, smb_fname, NULL, create_dir); if (dirname == NULL) { @@ -328,8 +336,6 @@ static NTSTATUS stream_smb_fname(vfs_handle_struct *handle, goto fail; } - stype = strchr_m(smb_fname->stream_name + 1, ':'); - stream_fname = talloc_asprintf(talloc_tos(), "%s/%s", dirname, smb_fname->stream_name); |