summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-03-16 15:21:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:33 -0500
commit2b1641c9947e8845e52218d8f112a5bace5e37a0 (patch)
tree21d557318daa9edc86272da2421729c2f10cea7c /source3
parenta6da854a08e4ba9f50d4fd66bf225062dffea209 (diff)
downloadsamba-2b1641c9947e8845e52218d8f112a5bace5e37a0.tar.gz
samba-2b1641c9947e8845e52218d8f112a5bace5e37a0.tar.bz2
samba-2b1641c9947e8845e52218d8f112a5bace5e37a0.zip
r14480: Kill one boolean flag passed down :-)
(This used to be commit d9b85e3b287c24d2a3e2076da331fe06192b0eef)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd.c2
-rw-r--r--source3/nsswitch/winbindd_util.c14
2 files changed, 7 insertions, 9 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 33ec9ded83..dc62a8563a 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/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/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(),