winbindd: use find_trust_from_name_noinit when we require a direct trust

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/winbindd/winbindd_irpc.c b/source3/winbindd/winbindd_irpc.c
index d0d68c89411041f1ebaa8e1fab445ac37cf0e8f6..4101469ad99350e47142667e177e524b4fe67871 100644 (file)
--- a/source3/winbindd/winbindd_irpc.c
+++ b/source3/winbindd/winbindd_irpc.c
@@ -282,7 +282,7 @@ static NTSTATUS wb_irpc_GetForestTrustInformation(struct irpc_message *msg,
                return NT_STATUS_OK;
        }
 
-       domain = find_domain_from_name_noinit(req->in.trusted_domain_name);
+       domain = find_trust_from_name_noinit(req->in.trusted_domain_name);
        if (domain == NULL) {
                req->out.result = WERR_NO_SUCH_DOMAIN;
                return NT_STATUS_OK;

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 6cf3342076854eb7b609f82e62cb7c9f861377d0..c80e7844bc2a1a94a66223ab0dc9f7160cf7dd39 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -336,7 +336,7 @@ void winbindd_dc_info(struct winbindd_cli_state *cli)
                  cli->request->domain_name));
 
        if (cli->request->domain_name[0] != '\0') {
-               domain = find_domain_from_name_noinit(
+               domain = find_trust_from_name_noinit(
                        cli->request->domain_name);
                if (domain == NULL) {
                        DEBUG(10, ("Could not find domain %s\n",

diff --git a/source3/winbindd/winbindd_ping_dc.c b/source3/winbindd/winbindd_ping_dc.c
index 05e840206251fc2b7f7a97ec6b020c3c0241d75e..a6cea79ee2a7de5f98d070b6b9f57bbfb65a54c2 100644 (file)
--- a/source3/winbindd/winbindd_ping_dc.c
+++ b/source3/winbindd/winbindd_ping_dc.c
@@ -47,7 +47,7 @@ struct tevent_req *winbindd_ping_dc_send(TALLOC_CTX *mem_ctx,
                /* preserve old behavior, when no domain name is given */
                domain = find_our_domain();
        } else {
-               domain = find_domain_from_name_noinit(request->domain_name);
+               domain = find_trust_from_name_noinit(request->domain_name);
        }
        if (domain == NULL) {
                tevent_req_nterror(req, NT_STATUS_NO_SUCH_DOMAIN);