diff options
| author | Gerald Carter <jerry@samba.org> | 2003-09-05 17:57:45 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-09-05 17:57:45 +0000 |
| commit | 7544b0c77382e300da0e2daf2b325527a23e6ddc (patch) | |
| tree | 954ee42d9b9e822868cef6e297fa4dc828f21598 /source3/nsswitch/winbindd_ads.c | |
| parent | cadff241823b9c2a239f5a5686629c280d2c2a48 (diff) | |
| download | samba-7544b0c77382e300da0e2daf2b325527a23e6ddc.tar.gz samba-7544b0c77382e300da0e2daf2b325527a23e6ddc.tar.bz2 samba-7544b0c77382e300da0e2daf2b325527a23e6ddc.zip | |
fixes for ads domain membership when only the realm is defined in
smb.conf
Fixes to ensure we work with disable netbios = yes
(This used to be commit 3913e43724870c62a0d77ec3e73cbe9480cb6247)
Diffstat (limited to 'source3/nsswitch/winbindd_ads.c')
| -rw-r--r-- | source3/nsswitch/winbindd_ads.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c index 41dffc3ab6..7c360bf156 100644 --- a/source3/nsswitch/winbindd_ads.c +++ b/source3/nsswitch/winbindd_ads.c @@ -945,6 +945,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, struct cli_state *cli = NULL; /* i think we only need our forest and downlevel trusted domains */ uint32 flags = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND; + char *contact_domain_name; DEBUG(3,("ads: trusted_domains\n")); @@ -953,9 +954,10 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, *names = NULL; *dom_sids = NULL; - if ( !NT_STATUS_IS_OK(result = cm_fresh_connection(domain->name, PI_NETLOGON, &cli)) ) { + contact_domain_name = *domain->alt_name ? domain->alt_name : domain->name; + if ( !NT_STATUS_IS_OK(result = cm_fresh_connection(contact_domain_name, PI_NETLOGON, &cli)) ) { DEBUG(5, ("trusted_domains: Could not open a connection to %s for PIPE_NETLOGON (%s)\n", - domain->name, nt_errstr(result))); + contact_domain_name, nt_errstr(result))); return NT_STATUS_UNSUCCESSFUL; } |