r16833: Add a base DN to more search calls, we need to look for an ID over the

whole tree here.

Andrew Bartlett
(This used to be commit 7674306e673341513d26556a845a698a28dec92b)

diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c
index 3590c57b84c2208bcaf5a0b818e7c1286b5c6ab2..38c4ba49a9ee68fb2f957cc187222321f3228a90 100644 (file)
--- a/source4/dsdb/common/sidmap.c
+++ b/source4/dsdb/common/sidmap.c
@@ -137,7 +137,7 @@ _PUBLIC_ NTSTATUS sidmap_sid_to_unixuid(struct sidmap_context *sidmap,
 
        tmp_ctx = talloc_new(sidmap);
 
-       ret = gendb_search(sidmap->samctx, tmp_ctx, NULL, &res, attrs, 
+       ret = gendb_search(sidmap->samctx, tmp_ctx, samdb_base_dn(tmp_ctx), &res, attrs, 
                           "objectSid=%s", ldap_encode_ndr_dom_sid(tmp_ctx, sid));
        if (ret != 1) {
                goto allocated_sid;
@@ -233,7 +233,7 @@ _PUBLIC_ NTSTATUS sidmap_sid_to_unixgid(struct sidmap_context *sidmap,
 
        tmp_ctx = talloc_new(sidmap);
 
-       ret = gendb_search(sidmap->samctx, tmp_ctx, NULL, &res, attrs, 
+       ret = gendb_search(sidmap->samctx, tmp_ctx, samdb_base_dn(tmp_ctx), &res, attrs, 
                           "objectSid=%s", ldap_encode_ndr_dom_sid(tmp_ctx, sid));
        if (ret != 1) {
                goto allocated_sid;
@@ -347,7 +347,7 @@ _PUBLIC_ NTSTATUS sidmap_uid_to_sid(struct sidmap_context *sidmap,
                   given uid
        */
 
-       ret = gendb_search(sidmap->samctx, tmp_ctx, NULL, &res, attrs, 
+       ret = gendb_search(sidmap->samctx, tmp_ctx, samdb_base_dn(tmp_ctx), &res, attrs, 
                           "unixID=%u", (unsigned int)uid);
        for (i=0;i<ret;i++) {
                if (!is_user_account(res[i])) continue;
@@ -445,7 +445,7 @@ _PUBLIC_ NTSTATUS sidmap_gid_to_sid(struct sidmap_context *sidmap,
                   given gid
        */
 
-       ret = gendb_search(sidmap->samctx, tmp_ctx, NULL, &res, attrs, 
+       ret = gendb_search(sidmap->samctx, tmp_ctx, samdb_base_dn(tmp_ctx), &res, attrs, 
                           "unixID=%u", (unsigned int)gid);
        for (i=0;i<ret;i++) {
                if (!is_group_account(res[i])) continue;
@@ -465,7 +465,7 @@ _PUBLIC_ NTSTATUS sidmap_gid_to_sid(struct sidmap_context *sidmap,
                goto allocate_sid;
        }
 
-       ret = gendb_search(sidmap->samctx, tmp_ctx, NULL, &res, attrs, 
+       ret = gendb_search(sidmap->samctx, tmp_ctx, samdb_base_dn(tmp_ctx), &res, attrs, 
                           "(|(unixName=%s)(sAMAccountName=%s))", 
                           grp->gr_name, grp->gr_name);
        for (i=0;i<ret;i++) {