diff options
Diffstat (limited to 'source3/nsswitch')
-rw-r--r-- | source3/nsswitch/wbinfo.c | 2 | ||||
-rw-r--r-- | source3/nsswitch/winbindd.c | 3 | ||||
-rw-r--r-- | source3/nsswitch/winbindd_misc.c | 8 | ||||
-rw-r--r-- | source3/nsswitch/wins.c | 1 |
4 files changed, 2 insertions, 12 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 237995af7f..9d3568417f 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -356,14 +356,12 @@ int main(int argc, char **argv) } TimeInit(); - charset_initialise(); if (!lp_load(CONFIGFILE, True, False, False)) { DEBUG(0, ("error opening config file\n")); exit(1); } - codepage_initialise(lp_client_code_page()); load_interfaces(); /* Parse command line options */ diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index 305c18a8c0..4177d0219a 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -700,7 +700,6 @@ int main(int argc, char **argv) } TimeInit(); - charset_initialise(); if (!reload_services_file(False)) { DEBUG(0, ("error opening config file\n")); @@ -711,8 +710,6 @@ int main(int argc, char **argv) DEBUGLEVEL = new_debuglevel; } - codepage_initialise(lp_client_code_page()); - if (!interactive) { become_daemon(); } diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c index 182f983efb..163837d1c3 100644 --- a/source3/nsswitch/winbindd_misc.c +++ b/source3/nsswitch/winbindd_misc.c @@ -45,16 +45,12 @@ static char *trust_keystr(char *domain) Routine to get the trust account password for a domain ************************************************************************/ BOOL _get_trust_account_password(char *domain, unsigned char *ret_pwd, - time_t *pass_last_set_time) + time_t *pass_last_set_time) { struct machine_acct_pass *pass; - fstring dos_domain; size_t size; - fstrcpy(dos_domain, domain); - unix_to_dos(dos_domain, True); - - if (!(pass = secrets_fetch(trust_keystr(dos_domain), &size)) || + if (!(pass = secrets_fetch(trust_keystr(domain), &size)) || size != sizeof(*pass)) return False; if (pass_last_set_time) *pass_last_set_time = pass->mod_time; diff --git a/source3/nsswitch/wins.c b/source3/nsswitch/wins.c index ac6d13a64f..bfd1835b4e 100644 --- a/source3/nsswitch/wins.c +++ b/source3/nsswitch/wins.c @@ -77,7 +77,6 @@ struct in_addr *lookup_backend(const char *name, int *count) DEBUGLEVEL = 0; TimeInit(); setup_logging("nss_wins",True); - charset_initialise(); lp_load(CONFIGFILE,True,False,False); load_interfaces(); } |