summaryrefslogtreecommitdiff
path: root/source3/nsswitch/winbindd_rpc.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-05-21 19:12:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:17 -0500
commit53719c6d7d155e6e61ee67341cbc058a3fa52295 (patch)
treea8c438429961204147134ef5c4001ce2d444c152 /source3/nsswitch/winbindd_rpc.c
parent0afd56aa837527941560118d8d156032fb8a2e8d (diff)
downloadsamba-53719c6d7d155e6e61ee67341cbc058a3fa52295.tar.gz
samba-53719c6d7d155e6e61ee67341cbc058a3fa52295.tar.bz2
samba-53719c6d7d155e6e61ee67341cbc058a3fa52295.zip
r23046: Few missing merges from cleaning out the Centeris winbindd tree.
Nothing of major interest. Will fix a few problems with one way trusts. (This used to be commit 3d48a7e72d9268fd495e0ca4b6e73bed5bb57214)
Diffstat (limited to 'source3/nsswitch/winbindd_rpc.c')
-rw-r--r--source3/nsswitch/winbindd_rpc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index ee8044a667..4a6448348e 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -458,6 +458,12 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
return NT_STATUS_OK;
}
+ if ( !winbindd_can_contact_domain( domain ) ) {
+ DEBUG(10,("query_user: No incoming trust for domain %s\n",
+ domain->name));
+ return NT_STATUS_OK;
+ }
+
/* no cache; hit the wire */
result = cm_connect_sam(domain, mem_ctx, &cli, &dom_pol);