diff options
author | Gerald Carter <jerry@samba.org> | 2007-05-21 19:12:14 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:17 -0500 |
commit | 3d48a7e72d9268fd495e0ca4b6e73bed5bb57214 (patch) | |
tree | a5d85d542034a2a711d5c8f53c4b335ce50b843d /source/nsswitch | |
parent | 2553b6a56d20ef6273001ae3b090e156e676592c (diff) | |
download | samba-3d48a7e72d9268fd495e0ca4b6e73bed5bb57214.tar.gz samba-3d48a7e72d9268fd495e0ca4b6e73bed5bb57214.tar.xz samba-3d48a7e72d9268fd495e0ca4b6e73bed5bb57214.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.
Diffstat (limited to 'source/nsswitch')
-rw-r--r-- | source/nsswitch/winbindd.c | 4 | ||||
-rw-r--r-- | source/nsswitch/winbindd_rpc.c | 6 | ||||
-rw-r--r-- | source/nsswitch/winbindd_util.c | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c index 790d59c0865..ed0bdeb13ad 100644 --- a/source/nsswitch/winbindd.c +++ b/source/nsswitch/winbindd.c @@ -1164,6 +1164,10 @@ int main(int argc, char **argv, char **envp) wcache_tdc_clear(); + /* clear the cached list of trusted domains */ + + wcache_tdc_clear(); + if (!init_domain_list()) { DEBUG(0,("unable to initalize domain list\n")); exit(1); diff --git a/source/nsswitch/winbindd_rpc.c b/source/nsswitch/winbindd_rpc.c index ee8044a6678..4a6448348e9 100644 --- a/source/nsswitch/winbindd_rpc.c +++ b/source/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); diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c index 231e11ae458..2bec404a137 100644 --- a/source/nsswitch/winbindd_util.c +++ b/source/nsswitch/winbindd_util.c @@ -148,6 +148,16 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const return domain; } + /* See if we found a match. Check if we need to update the + SID. */ + + if ( domain ) { + if ( sid_equal( &domain->sid, &global_sid_NULL ) ) + sid_copy( &domain->sid, sid ); + + return domain; + } + /* Create new domain entry */ if ((domain = SMB_MALLOC_P(struct winbindd_domain)) == NULL) |