sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

mdssvc: fix kMDScopeArray parsing

Browse Source 
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
This commit is contained in:
Ralph Boehme 2023-01-18 16:21:16 +01:00 committed by Jule Anger
parent eddd14cedb
commit 2b1d412f55
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/rpc_server/mdssvc/mdssvc.c
View File

@ -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;
}