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 | 53719c6d7d155e6e61ee67341cbc058a3fa52295 (patch) | |
| tree | a8c438429961204147134ef5c4001ce2d444c152 /source3/nsswitch/winbindd_util.c | |
| parent | 0afd56aa837527941560118d8d156032fb8a2e8d (diff) | |
| download | samba-53719c6d7d155e6e61ee67341cbc058a3fa52295.tar.gz samba-53719c6d7d155e6e61ee67341cbc058a3fa52295.tar.bz2 samba-53719c6d7d155e6e61ee67341cbc058a3fa52295.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.
(This used to be commit 3d48a7e72d9268fd495e0ca4b6e73bed5bb57214)
Diffstat (limited to 'source3/nsswitch/winbindd_util.c')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 231e11ae45..2bec404a13 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/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) |