idmap: Use a range search in idmap_backends_unixid_to_sid

This obsoletes the domain name in the xid2sid calls

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11464

diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 7b4a84d030f955da5375308cad6a54eaa0d77938..24277cac008ff460ece202fd37558953199ab18e 100644 (file)
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -507,6 +507,7 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id)
        struct idmap_domain *dom;
        struct id_map *maps[2];
        bool ok;
+       int i;
 
        ok = idmap_init();
        if (!ok) {
@@ -531,7 +532,16 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id)
                return NT_STATUS_OK;
        }
 
-       dom = idmap_find_domain(domname);
+       dom = default_idmap_domain;
+
+       for (i=0; i<num_domains; i++) {
+               if ((id->xid.id >= idmap_domains[i]->low_id) &&
+                   (id->xid.id <= idmap_domains[i]->high_id)) {
+                       dom = idmap_domains[i];
+                       break;
+               }
+       }
+
        if (dom == NULL) {
                return NT_STATUS_NONE_MAPPED;
        }