diff options
| author | Ralph Boehme <slow@samba.org> | 2023-01-18 16:21:16 +0100 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2023-02-10 12:15:02 +0000 |
| commit | 2b1d412f552c7724dc2464793ad60e0108443436 (patch) | |
| tree | ea462454ed0539a2934d06704b751e9dc1ee9ca4 | |
| parent | eddd14cedbf6cc0a8c32f0e00e138c94aa941541 (diff) | |
| download | samba-2b1d412f552c7724dc2464793ad60e0108443436.tar.gz | |
mdssvc: fix kMDScopeArray parsing
In macOS Ventura marshalling of kMDScopeArray in the "openQueryWithParams"
request has changed from
string: kMDScopeArray
sl_array_t(#1): {
string: /foo/bar
}
to:
string: kMDScopeArray
sl_array_t(#1): {
sl_array_t(#1): {
string: /foo/bar
}
}
With this patch we check both encodings. Bug fixed according to user feedback.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15299
RN: Spotlight doesn't work with latest macOS Ventura
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 1dd0cd2f4e644ad43b0e7ee2aaae19799e859585)
Autobuild-User(v4-16-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-16-test): Fri Feb 10 12:15:02 UTC 2023 on sn-devel-184
| -rw-r--r-- | source3/rpc_server/mdssvc/mdssvc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c index a4b082b3274..4f1629b2b4d 100644 --- a/source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -932,6 +932,12 @@ static bool slrpc_open_query(struct mds_ctx *mds_ctx, scope = dalloc_get(path_scope, "char *", 0); if (scope == NULL) { + scope = dalloc_get(path_scope, + "DALLOC_CTX", 0, + "char *", 0); + } + if (scope == NULL) { + DBG_ERR("Failed to parse kMDScopeArray\n"); goto error; } |