summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-11-18 22:50:57 +0000
committerTim Potter <tpot@samba.org>2002-11-18 22:50:57 +0000
commite20b99f22615939aedfac2d3e7090dcd0a7edcdd (patch)
treec7034eae92333ca99ab9f85d9b6e4532831cfddb
parent6631577f8a90e8184d1719a797d6f4e2e908de8e (diff)
downloadsamba-e20b99f22615939aedfac2d3e7090dcd0a7edcdd.tar.gz
samba-e20b99f22615939aedfac2d3e7090dcd0a7edcdd.tar.bz2
samba-e20b99f22615939aedfac2d3e7090dcd0a7edcdd.zip
Bug fix from appliance - we must initialise the winbindd server state
before reading smb.conf parameters, not after. (This used to be commit 7bdaa03f2fc7ea6ef0f56f7c73b951c177d64a2e)
-rw-r--r--source3/nsswitch/winbindd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 8ec8bdced6..4bfec1afe4 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -684,6 +684,8 @@ BOOL winbind_setup_common(void)
/* Check winbindd parameters are valid */
+ ZERO_STRUCT(server_state);
+
if (!winbindd_param_init())
return False;
@@ -693,8 +695,6 @@ BOOL winbind_setup_common(void)
init_domain_list();
- ZERO_STRUCT(server_state);
-
/* Winbind daemon initialisation */
if (!winbindd_idmap_init())