From 2b1641c9947e8845e52218d8f112a5bace5e37a0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 16 Mar 2006 15:21:41 +0000 Subject: r14480: Kill one boolean flag passed down :-) (This used to be commit d9b85e3b287c24d2a3e2076da331fe06192b0eef) --- source3/nsswitch/winbindd_util.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'source3/nsswitch/winbindd_util.c') diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index ae5f826a88..367f319987 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -61,8 +61,9 @@ struct winbindd_domain *domain_list(void) { /* Initialise list */ - if (!_domain_list) - init_domain_list(False); + if ((!_domain_list) && (!init_domain_list())) { + smb_panic("Init_domain_list failed\n"); + } return _domain_list; } @@ -498,7 +499,7 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai } /* Look up global info for the winbind daemon */ -BOOL init_domain_list(BOOL initial_start) +BOOL init_domain_list(void) { extern struct winbindd_methods cache_methods; extern struct winbindd_methods passdb_methods; @@ -518,11 +519,8 @@ BOOL init_domain_list(BOOL initial_start) DOM_SID our_sid; if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) { - if (initial_start) { - return False; - } else { - smb_panic("Could not fetch our SID - did we join?\n"); - } + DEBUG(0, ("Could not fetch our SID - did we join?\n")); + return False; } domain = add_trusted_domain( lp_workgroup(), lp_realm(), -- cgit