diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 13:59:05 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 09:29:35 +0100 |
| commit | 1ad8e5229f618fc04af371ba52b81f2e7e1f88f5 (patch) | |
| tree | 691e7f9788fe4c5f2a8e21af7c88d4525813aedb /source3 | |
| parent | 2a3a86a86f3d1ab97adda563beda7ee35f6a2414 (diff) | |
| download | samba-1ad8e5229f618fc04af371ba52b81f2e7e1f88f5.tar.gz samba-1ad8e5229f618fc04af371ba52b81f2e7e1f88f5.tar.bz2 samba-1ad8e5229f618fc04af371ba52b81f2e7e1f88f5.zip | |
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 <abartlet@samba.org>
Autobuild-Date: Fri Feb 18 09:29:35 CET 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/charcnv.c | 2 | ||||
| -rw-r--r-- | source3/lib/netapi/netapi.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_context.c | 2 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_acct.c | 2 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_auth.c | 2 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_passwd.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 2723599599..6f1ced69d0 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -51,7 +51,7 @@ static bool initialized; void lazy_initialize_conv(void) { if (!initialized) { - load_case_tables(); + load_case_tables_library(); init_iconv(); initialized = true; } diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index 9d76017a01..c04ca70249 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -68,7 +68,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context) frame = talloc_stackframe(); /* Case tables must be loaded before any string comparisons occour */ - load_case_tables(); + load_case_tables_library(); /* When libnetapi is invoked from an application, it does not * want to be swamped with level 10 debug messages, even if diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index ab2db9d3e9..9c8429aab4 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -45,7 +45,7 @@ SMBC_module_init(void * punused) char *home = NULL; TALLOC_CTX *frame = talloc_stackframe(); - load_case_tables(); + load_case_tables_library(); setup_logging("libsmbclient", DEBUG_STDOUT); 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); |