1 Index: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
2 ===================================================================
3 --- SAMBA_3_0/source/nsswitch/winbindd_util.c (revision 14467)
4 +++ SAMBA_3_0/source/nsswitch/winbindd_util.c (revision 14468)
10 + init_domain_list(False);
17 /* Look up global info for the winbind daemon */
18 -void init_domain_list(void)
19 +BOOL init_domain_list(BOOL initial_start)
21 extern struct winbindd_methods cache_methods;
22 extern struct winbindd_methods passdb_methods;
26 if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) {
27 - smb_panic("Could not fetch our SID - did we join?\n");
28 + if (initial_start) {
31 + smb_panic("Could not fetch our SID - did we join?\n");
35 domain = add_trusted_domain( lp_workgroup(), lp_realm(),
37 get_global_sam_sid());
38 setup_domain_child(domain, &domain->child, NULL);
45 Index: branches/SAMBA_3_0/source/nsswitch/winbindd.c
46 ===================================================================
47 --- SAMBA_3_0/source/nsswitch/winbindd.c (revision 14467)
48 +++ SAMBA_3_0/source/nsswitch/winbindd.c (revision 14468)
49 @@ -1067,7 +1067,10 @@
51 netsamlogon_cache_init(); /* Non-critical */
54 + if (!init_domain_list(True)) {
55 + DEBUG(0,("unable to initalize domain list\n"));