winbindd: Fix indentation

[sfrench/samba-autobuild/.git] / source3 / winbindd / wb_sids2xids.c

diff --git a/source3/winbindd/wb_sids2xids.c b/source3/winbindd/wb_sids2xids.c
index e16917f1545a9a40985dc3f3dd70973f4c515d95..b8ad300ba3c80e1e82f5eccc1f87421d7ca963a7 100644 (file)
--- a/source3/winbindd/wb_sids2xids.c
+++ b/source3/winbindd/wb_sids2xids.c
@@ -40,7 +40,7 @@ struct wb_sids2xids_state {
        /*
         * Domain array to use for the idmap call. The output from
         * lookupsids cannot be used directly since for migrated
-        * objects the returned domain SID can be different that the
+        * objects the returned domain SID can be different than the
         * original one. The new domain SID cannot be combined with
         * the RID from the previous domain.
         *
@@ -185,20 +185,45 @@ static void wb_sids2xids_lookupsids_done(struct tevent_req *subreq)
        }
 
        for (i=0; i<state->num_non_cached; i++) {
+               const struct dom_sid *sid = &state->non_cached[i];
                struct dom_sid dom_sid;
-               struct lsa_DomainInfo *info;
                struct lsa_TranslatedName *n = &names->names[i];
                struct wbint_TransID *t = &state->ids.ids[i];
                int domain_index;
+               const char *domain_name = NULL;
 
-               sid_copy(&dom_sid, &state->non_cached[i]);
-               sid_split_rid(&dom_sid, &t->rid);
+               if (n->sid_index != UINT32_MAX) {
+                       const struct lsa_DomainInfo *info;
+                       bool match;
 
-               info = &domains->domains[n->sid_index];
-               t->type = lsa_SidType_to_id_type(n->sid_type);
+                       info = &domains->domains[n->sid_index];
+                       match = dom_sid_in_domain(info->sid, sid);
+                       if (match) {
+                               domain_name = info->name.string;
+                       }
+               }
+               if (domain_name == NULL) {
+                       struct winbindd_domain *wb_domain = NULL;
+
+                       /*
+                        * This is needed to handle Samba DCs
+                        * which always return sid_index == UINT32_MAX for
+                        * unknown sids.
+                        */
+                       wb_domain = find_domain_from_sid_noinit(sid);
+                       if (wb_domain != NULL) {
+                               domain_name = wb_domain->name;
+                       }
+               }
+               if (domain_name == NULL) {
+                       domain_name = "";
+               }
 
+               sid_copy(&dom_sid, sid);
+               sid_split_rid(&dom_sid, &t->rid);
+               t->type = lsa_SidType_to_id_type(n->sid_type);
                domain_index = init_lsa_ref_domain_list(
-                       state, &state->idmap_doms, info->name.string, &dom_sid);
+                       state, &state->idmap_doms, domain_name, &dom_sid);
                if (domain_index == -1) {
                        tevent_req_oom(req);
                        return;
@@ -305,7 +330,7 @@ static void wb_sids2xids_done(struct tevent_req *subreq)
                 * All we can do here is to report "not mapped"
                 */
                for (i=0; i<src->num_ids; i++) {
-                       src->ids[i].type = ID_TYPE_NOT_SPECIFIED;
+                       src->ids[i].xid.type = ID_TYPE_NOT_SPECIFIED;
                }
        }