The branch, v4-17-test has been updated
       via  79c06ede865 mdssvc: fix kMDScopeArray parsing
      from  cee7ecee5ca s4-drsuapi: Give an error that matches windows on 
destination_dsa_guid lookup failure

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test


- Log -----------------------------------------------------------------
commit 79c06ede865b2a78688c91244eba513eba3598f1
Author: Ralph Boehme <s...@samba.org>
Date:   Wed Jan 18 16:21:16 2023 +0100

    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 <s...@samba.org>
    Reviewed-by: Jeremy Allison <j...@samba.org>
    (cherry picked from commit 1dd0cd2f4e644ad43b0e7ee2aaae19799e859585)
    
    Autobuild-User(v4-17-test): Jule Anger <jan...@samba.org>
    Autobuild-Date(v4-17-test): Fri Feb 10 10:43:35 UTC 2023 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/mdssvc/mdssvc.c | 6 ++++++
 1 file changed, 6 insertions(+)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository

Reply via email to