From 1ad8e5229f618fc04af371ba52b81f2e7e1f88f5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 18 Feb 2011 13:59:05 +1100 Subject: lib/util/charset Add back setlocale(), but only when called from binaries When called from a library, we don't want to call this, as we may overwrite some of our calling program's context. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Fri Feb 18 09:29:35 CET 2011 on sn-devel-104 --- source3/pam_smbpass/pam_smb_acct.c | 2 +- source3/pam_smbpass/pam_smb_auth.c | 2 +- source3/pam_smbpass/pam_smb_passwd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/pam_smbpass') diff --git a/source3/pam_smbpass/pam_smb_acct.c b/source3/pam_smbpass/pam_smb_acct.c index 650d322b35..63323d8d8f 100644 --- a/source3/pam_smbpass/pam_smb_acct.c +++ b/source3/pam_smbpass/pam_smb_acct.c @@ -57,7 +57,7 @@ int pam_sm_acct_mgmt( pam_handle_t *pamh, int flags, void (*oldsig_handler)(int); /* Samba initialization. */ - load_case_tables(); + load_case_tables_library(); lp_set_in_client(True); ctrl = set_ctrl(pamh, flags, argc, argv ); diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c index feb469792d..24702131b4 100644 --- a/source3/pam_smbpass/pam_smb_auth.c +++ b/source3/pam_smbpass/pam_smb_auth.c @@ -80,7 +80,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, char *p = NULL; /* Samba initialization. */ - load_case_tables(); + load_case_tables_library(); lp_set_in_client(True); ctrl = set_ctrl(pamh, flags, argc, argv); diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c index 8fc2cf3e14..54d9db7f31 100644 --- a/source3/pam_smbpass/pam_smb_passwd.c +++ b/source3/pam_smbpass/pam_smb_passwd.c @@ -105,7 +105,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, char *pass_new; /* Samba initialization. */ - load_case_tables(); + load_case_tables_library(); lp_set_in_client(True); ctrl = set_ctrl(pamh, flags, argc, argv); -- cgit