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/lib | |
| 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/lib')
| -rw-r--r-- | source3/lib/charcnv.c | 2 | ||||
| -rw-r--r-- | source3/lib/netapi/netapi.c | 2 |
2 files changed, 2 insertions, 2 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 |