diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-08-25 07:08:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:45 -0500 |
| commit | 0fd98079425cff37c45be824ffa2695458ff12f3 (patch) | |
| tree | 6e56cb6f01fcb4242918451a67f63aabeca76693 /source4/auth | |
| parent | fb36e279e79ae54c1622c316780e20fb9aaf1a85 (diff) | |
| download | samba-0fd98079425cff37c45be824ffa2695458ff12f3.tar.gz samba-0fd98079425cff37c45be824ffa2695458ff12f3.tar.bz2 samba-0fd98079425cff37c45be824ffa2695458ff12f3.zip | |
r17823: get rid of most of the samdb_base_dn() calls, as they are no longer
needed in searches
(This used to be commit a5ea749f0ac63bf495a55ee8d9d002208ab93572)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth_sam.c | 4 | ||||
| -rw-r--r-- | source4/auth/sam.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index 7ce2cabbf9..ee9a308ed8 100644 --- a/source4/auth/auth_sam.c +++ b/source4/auth/auth_sam.c @@ -75,8 +75,6 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context * } domain_dn = samdb_result_dn(mem_ctx, msgs_domain_ref[0], "nCName", NULL); - } else { - domain_dn = samdb_base_dn(mem_ctx); } /* pull the user attributes */ @@ -107,7 +105,7 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context * } /* find the domain's DN */ - ret = gendb_search(sam_ctx, mem_ctx, samdb_base_dn(mem_ctx), &msgs_tmp, NULL, + ret = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_tmp, NULL, "(&(objectSid=%s)(objectclass=domain))", ldap_encode_ndr_dom_sid(mem_ctx, domain_sid)); if (ret == -1) { diff --git a/source4/auth/sam.c b/source4/auth/sam.c index e7f70aa370..f616138a3e 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -206,7 +206,7 @@ _PUBLIC_ NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_conte TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); group_ret = gendb_search(sam_ctx, - tmp_ctx, samdb_base_dn(tmp_ctx), &group_msgs, group_attrs, + tmp_ctx, NULL, &group_msgs, group_attrs, "(&(member=%s)(sAMAccountType=*))", ldb_dn_linearize(tmp_ctx, msg->dn)); if (group_ret == -1) { |