sync master to feature branch

[liulinC]

No description provided.

[liulinC]

git show 15ec9dc3e43cab16fbef89c6c90d8b2b1a3ddaca                                                       
commit 15ec9dc3e43cab16fbef89c6c90d8b2b1a3ddaca (HEAD -> private/linl/sync, mgh/private/linl/sync)
Merge: 8f846bbaa 9a34ddc84
Author: Lin Liu <lin.liu01@citrix.com>
Date:   Tue Apr 28 05:58:43 2026 +0000

    Merge branch 'master' into private/linl/sync
                                                                                                         
diff --cc ocaml/xapi/extauth_plugin_ADwinbind.ml
index 2fbf20ff1,ad3dae694..f328b9716
--- a/ocaml/xapi/extauth_plugin_ADwinbind.ml
+++ b/ocaml/xapi/extauth_plugin_ADwinbind.ml
@@@ -20,9 -20,7 +20,8 @@@ module D = Debug.Make (struc
  end)
   
  open D
- open Xapi_stdext_std.Xstringext
  open Auth_signature
 +module Listext = Xapi_stdext_std.Listext
  module Scheduler = Xapi_stdext_threads_scheduler.Scheduler
   
  let finally = Xapi_stdext_pervasives.Pervasiveext.finally
@@@ -1617,18 -1493,19 +1650,20 @@@ module AuthADWinbind : Auth_signature.A
        it's a string*string list anyway for possible future expansion.
        Raises Not_found (*Subject_cannot_be_resolved*) if subject_id cannot be resolved by external auth service
    *)
+   (* Fallback uid/gid when the winbind daemon fails to resolve the SID *)
+   let invalid_id = -1
+ 
    let query_subject_information ~__context (sid : string) =
 -    let@ __context = Context.with_tracing ~__context __FUNCTION__ in
 +    Context.with_tracing ~__context __FUNCTION__ @@ fun __context ->
 +    cond_sync_ext_auth @@ fun () ->
      let res =
-       let* name = Wbinfo.name_of_sid sid in
-       match name with
-       | User _ ->
-           let* uid = Wbinfo.uid_of_sid sid in
+       match Subject.of_sid ~__context sid with
+       | Subject.User _ ->
+           let uid = Wbinfo.uid_of_sid sid |> Result.value ~default:invalid_id in
 -          query_subject_information_user uid sid
 +          query_subject_information_user ~__context uid sid
-       | Other name ->
+       | Subject.Group name ->
            (* if the name doesn't correspond to a user then it ought to be a group *)
-           let* gid = Wbinfo.gid_of_sid sid in
+           let gid = Wbinfo.gid_of_sid sid |> Result.value ~default:invalid_id in
            Ok (query_subject_information_group name gid sid)