1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00

r23046: Few missing merges from cleaning out the Centeris winbindd tree.

Nothing of major interest.  Will fix a few problems with one way trusts.
(This used to be commit 3d48a7e72d)
This commit is contained in:
Gerald Carter 2007-05-21 19:12:14 +00:00 committed by Gerald (Jerry) Carter
parent 0afd56aa83
commit 53719c6d7d
4 changed files with 21 additions and 1 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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)

View File

@ -1307,7 +1307,7 @@ static BOOL pdb_default_sid_to_id(struct pdb_methods *methods,
goto done;
}
/* check for "Unix User" */
/* check for "Unix Group" */
if ( sid_peek_check_rid(&global_sid_Unix_Groups, sid, &rid) ) {
id->gid = rid;