diff options
| author | Ralph Boehme <slow@samba.org> | 2023-01-18 16:21:16 +0100 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2023-02-10 10:52:15 +0000 |
| commit | 8816c1b6e315f499afa66610a999ca82b38cb28d (patch) | |
| tree | 1fc9752465cd57abbc49a86f6eff8197f34d1097 | |
| parent | 3a5190b80b878443d9d541f4d42ec414e2442eed (diff) | |
| download | samba-8816c1b6e315f499afa66610a999ca82b38cb28d.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)
| -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 01713722126..9b32c99b8b3 100644 --- a/source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -919,6 +919,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; } |