diff options
| author | Jeremy Allison <jra@samba.org> | 2006-12-06 23:14:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:23 -0500 |
| commit | 155083547af5d50c485d60319f7a329842b83c82 (patch) | |
| tree | c93d8bd59995310b32699d28d4370bc8c07a7529 /source3/nsswitch/winbindd_util.c | |
| parent | 4a1efb1abe1882173d25dbd6c4ebdbf53521b42c (diff) | |
| download | samba-155083547af5d50c485d60319f7a329842b83c82.tar.gz samba-155083547af5d50c485d60319f7a329842b83c82.tar.bz2 samba-155083547af5d50c485d60319f7a329842b83c82.zip | |
r20057: Attempt to fix connect timeouts when connected on
a network but not one on which any home DC's can
be found (hotel network problem). Still testing
but this is getting close.
Jeremy.
(This used to be commit 369c9e4138b93f7cfb6680f0beb541f58554e856)
Diffstat (limited to 'source3/nsswitch/winbindd_util.c')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index cdffc28087..98990664e3 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -163,6 +163,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const domain->last_seq_check = 0; domain->initialized = False; domain->online = is_internal_domain(sid); + domain->check_online_timeout = 0; if (sid) { sid_copy(&domain->sid, sid); } @@ -462,7 +463,6 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai init_dc_connection(domain); -#if 1 if (!domain->initialized) { /* If we return error here we can't do any cached authentication, but we may be in disconnected mode and can't initialize correctly. @@ -472,13 +472,6 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai DEBUG(5, ("winbindd_dual_init_connection: %s returning without initialization " "online = %d\n", domain->name, (int)domain->online )); } -#else - if (!domain->initialized) { - DEBUG(1, ("Could not initialize domain %s\n", - state->request.domain_name)); - return WINBINDD_ERROR; - } -#endif fstrcpy(state->response.data.domain_info.name, domain->name); fstrcpy(state->response.data.domain_info.alt_name, domain->alt_name); |