diff options
| author | Steven Danneman <steven.danneman@isilon.com> | 2008-03-25 16:50:58 -0700 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-03-31 13:40:58 -0500 |
| commit | 223071f01de8d85b594bab7c1f8514386da11281 (patch) | |
| tree | 066a97b926a47406458842538bdba927700a2d06 /source3/winbindd/winbindd_util.c | |
| parent | 0ad8a002ce90c7567952cf9923bae57136cff565 (diff) | |
| download | samba-223071f01de8d85b594bab7c1f8514386da11281.tar.gz samba-223071f01de8d85b594bab7c1f8514386da11281.tar.bz2 samba-223071f01de8d85b594bab7c1f8514386da11281.zip | |
Forest root trust flags won't overwrite child trust flags
* changed the behavior of winbind_ads.c:trusted_domains() to not overwrite
existing trust information if we're joined to a child domain, and querying the
forest root domain. Previously if we were joined to a child domain, we'd
request all known trust information from this child domain (our primary domain)
and store it in the tdc. We'd then request all trust information from our tree
root (to get the forests we transitively trust) and overwrite the existing trust
information we already had from the perspective of the tree root.
* updated several comments and fixed typos
(This used to be commit 6aac972d790ad5ca65096cb2e85e6819b60a5413)
Diffstat (limited to 'source3/winbindd/winbindd_util.c')
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 038bafbe4e..641fd5a9f5 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -339,7 +339,7 @@ static void trustdom_recv(void *private_data, bool success) */ if ( state->primary ) { - /* If this is our primary domain and we are not the in the + /* If this is our primary domain and we are not in the forest root, we have to scan the root trusts first */ if ( !state->forest_root ) @@ -349,7 +349,7 @@ static void trustdom_recv(void *private_data, bool success) } else if ( state->forest_root ) { /* Once we have done root forest trust search, we can - go on to search thing trusted forests */ + go on to search the trusted forests */ rescan_forest_trusts(); } @@ -419,7 +419,7 @@ static void rescan_forest_root_trusts( void ) } /******************************************************************** - scan the transitive forest trists (not our own) + scan the transitive forest trusts (not our own) ********************************************************************/ |