diff options
| author | Gerald Carter <jerry@samba.org> | 2003-08-01 13:28:13 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-08-01 13:28:13 +0000 |
| commit | 10ba66164da3cbc9db0e39d3b8c6fbc9f93c64b1 (patch) | |
| tree | acde08bc8928d0f48423a87ab957b9c3ee30bf62 /source3/nsswitch/winbindd_util.c | |
| parent | f5b5a9793a5adb8df356f4798102cdc45dc586d2 (diff) | |
| download | samba-10ba66164da3cbc9db0e39d3b8c6fbc9f93c64b1.tar.gz samba-10ba66164da3cbc9db0e39d3b8c6fbc9f93c64b1.tar.bz2 samba-10ba66164da3cbc9db0e39d3b8c6fbc9f93c64b1.zip | |
fix cut-n-paste error found by abartlet
(This used to be commit 042492b862c4f2389086275dd8a0e044d7432537)
Diffstat (limited to 'source3/nsswitch/winbindd_util.c')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 0de30dbca8..a810e503a0 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -197,20 +197,22 @@ void rescan_trusted_domains(BOOL force) if ( sid_equal(&dom_sids[i], &null_sid) ) { - new_domain = find_domain_from_name(names[i]); + new_domain = find_domain_from_name(names[i]); - /* this should never happen */ - if ( !domain) { - DEBUG(0,("rescan_trust_domains: can't find the domain I just added! [%s]\n", + /* this should never happen */ + if ( !new_domain ) { + DEBUG(0,("rescan_trust_domains: can't find the domain I just added! [%s]\n", names[i])); break; - } + } - result = domain->methods->domain_sid( new_domain, &new_domain->sid ); + /* call the cache method; which will operate on the winbindd_domain \ + passed in and choose either rpc or ads as appropriate */ + + result = domain->methods->domain_sid( new_domain, &new_domain->sid ); - if ( NT_STATUS_IS_OK(result) ) + if ( NT_STATUS_IS_OK(result) ) sid_copy( &dom_sids[i], &domain->sid ); - } /* store trusted domain in the cache */ |