diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-22 10:40:26 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-23 13:47:27 +0200 |
| commit | 4d2c56c4b1a4f846b44f24c6f73e1b95fdf3a9bb (patch) | |
| tree | 9bb31b76650a6cbe558bfa2d357396220fc94abc /source3/utils | |
| parent | fb3d5ade9d3f935a69834aaee0046a54dbf38ca1 (diff) | |
| download | samba-4d2c56c4b1a4f846b44f24c6f73e1b95fdf3a9bb.tar.gz samba-4d2c56c4b1a4f846b44f24c6f73e1b95fdf3a9bb.tar.bz2 samba-4d2c56c4b1a4f846b44f24c6f73e1b95fdf3a9bb.zip | |
s3-net: Bind our gettext results to 'unix charset'
This ensures that the translations and any embedded strings are in the
same charset. It won't be the one from the user's locale (we no
longer auto-detect that), but it will be self-consistent.
Thanks to Steve Langasek for pointing this function out!
Andrew Bartlett
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c index 0d79d6e6d2..95b937444e 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -880,6 +880,16 @@ static struct functable net_func[] = { lp_load(get_dyn_CONFIGFILE(), true, false, false, true); +#if defined(HAVE_BIND_TEXTDOMAIN_CODESET) + /* Bind our gettext results to 'unix charset' + + This ensures that the translations and any embedded strings are in the + same charset. It won't be the one from the user's locale (we no + longer auto-detect that), but it will be self-consistent. + */ + bind_textdomain_codeset(MODULE_NAME, lp_unix_charset()); +#endif + argv_new = (const char **)poptGetArgs(pc); argc_new = argc; |