r14480: Kill one boolean flag passed down :-)

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 33ec9ded8371f0276512b12eaaed94203f61061d..dc62a8563a831361d7262304a2ba7fcf8a79682e 100644 (file)
--- a/source/nsswitch/winbindd.c
+++ b/source/nsswitch/winbindd.c
@@ -1071,7 +1071,7 @@ int main(int argc, char **argv)
 
        netsamlogon_cache_init(); /* Non-critical */
        
-       if (!init_domain_list(True)) {
+       if (!init_domain_list()) {
                DEBUG(0,("unable to initalize domain list\n"));
                exit(1);
        }

diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index ae5f826a887b2fccf9c0a2c55f1b2d634604bb89..367f319987ef62b9679e8369733b7b7d3ba788f9 100644 (file)
--- a/source/nsswitch/winbindd_util.c
+++ b/source/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(),