diff options
| author | Günther Deschner <gd@samba.org> | 2006-03-16 11:04:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:31 -0500 |
| commit | 5856fd510c577d61313474fc9788d72cce9a3c8e (patch) | |
| tree | f14467c78798a74634b61e19fc5bb6b74cf8e319 | |
| parent | 65fa8a1a4575ba4e5a0bd3c2285b7e19d969a06b (diff) | |
| download | samba-5856fd510c577d61313474fc9788d72cce9a3c8e.tar.gz samba-5856fd510c577d61313474fc9788d72cce9a3c8e.tar.bz2 samba-5856fd510c577d61313474fc9788d72cce9a3c8e.zip | |
r14467: Reverting 13660. This needs to be fixed differently.
Guenther
(This used to be commit 4157bfe9cfe79ff78e7e527a50058cf9103cab61)
| -rw-r--r-- | source3/nsswitch/winbindd.c | 5 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 12 |
2 files changed, 5 insertions, 12 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index f9ba80e533..80cb6990a5 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -1071,10 +1071,7 @@ int main(int argc, char **argv) netsamlogon_cache_init(); /* Non-critical */ - if (!init_domain_list()) { - DEBUG(0, ("unable to initialize domain list\n")); - exit(1); - } + init_domain_list(); init_idmap_child(); diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 64b4dd27a3..7ad3318fe8 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -61,9 +61,8 @@ struct winbindd_domain *domain_list(void) { /* Initialise list */ - if (!_domain_list && !init_domain_list()) { - return NULL; - } + if (!_domain_list) + init_domain_list(); return _domain_list; } @@ -499,7 +498,7 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai } /* Look up global info for the winbind daemon */ -BOOL init_domain_list(void) +void init_domain_list(void) { extern struct winbindd_methods cache_methods; extern struct winbindd_methods passdb_methods; @@ -519,8 +518,7 @@ BOOL init_domain_list(void) DOM_SID our_sid; if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) { - DEBUG(0,("Could not fetch our SID - did we join?\n")); - return False; + smb_panic("Could not fetch our SID - did we join?\n"); } domain = add_trusted_domain( lp_workgroup(), lp_realm(), @@ -542,8 +540,6 @@ BOOL init_domain_list(void) get_global_sam_sid()); setup_domain_child(domain, &domain->child, NULL); } - - return True; } /** |