diff options
| author | Gerald Carter <jerry@samba.org> | 2003-04-29 15:27:06 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-04-29 15:27:06 +0000 |
| commit | 4ae2e47b93c7f07fb395139d9614f0a90dbb8560 (patch) | |
| tree | 026c8166e45f296f6c48a12b64243709f07f46bc /source3/nsswitch/winbindd_util.c | |
| parent | 7b126ce7a0061c717b1561adf3ad06811ddb936d (diff) | |
| download | samba-4ae2e47b93c7f07fb395139d9614f0a90dbb8560.tar.gz samba-4ae2e47b93c7f07fb395139d9614f0a90dbb8560.tar.bz2 samba-4ae2e47b93c7f07fb395139d9614f0a90dbb8560.zip | |
remove convert_smbpasswd and addtosmbpass from tree; people can get them from 2.2. if they still need them
(This used to be commit 237857a760974bb02000e5d3a776240ec73ca6b6)
Diffstat (limited to 'source3/nsswitch/winbindd_util.c')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index b033380206..ef030e2c7b 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -126,7 +126,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const /* see if this is a native mode win2k domain, but only for our own domain */ - if ( strequal( lp_workgroup(), domain_name) ) { + if ( lp_server_role() != ROLE_DOMAIN_PDC && strequal( lp_workgroup(), domain_name) ) { domain->native_mode = cm_check_for_native_mode_win2k( domain_name ); DEBUG(3,("add_trusted_domain: %s is a %s mode domain\n", domain_name, domain->native_mode ? "native" : "mixed" )); @@ -211,6 +211,7 @@ BOOL init_domain_list(void) /* Add ourselves as the first entry */ domain = add_trusted_domain(lp_workgroup(), NULL, &cache_methods, NULL); + if (!secrets_fetch_domain_sid(domain->name, &domain->sid)) { DEBUG(1, ("Could not fetch sid for our domain %s\n", domain->name)); @@ -219,7 +220,7 @@ BOOL init_domain_list(void) /* get any alternate name for the primary domain */ cache_methods.alternate_name(domain); - + /* do an initial scan for trusted domains */ rescan_trusted_domains(True); |