diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-22 09:52:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-23 13:47:27 +0200 |
| commit | 125a2ff262aa312df20eec68802fd5f8a47f492f (patch) | |
| tree | 7308c0b58fa7016d8d174f2b50db32567f204895 /source4/param | |
| parent | 6c3cef773a989f175c518b435feebab287a58cf0 (diff) | |
| download | samba-125a2ff262aa312df20eec68802fd5f8a47f492f.tar.gz samba-125a2ff262aa312df20eec68802fd5f8a47f492f.tar.bz2 samba-125a2ff262aa312df20eec68802fd5f8a47f492f.zip | |
lib/util/charset: Remove 'display charset'
As discussed in 'CH_DISPLAY and gettext' on the samba-technical list:
http://lists.samba.org/archive/samba-technical/2011-June/078190.html
Setting this to a value other than 'unix charset' does not make sense,
as any system where the filesytem charset does not equal the terminal
charset will already have problems with programs as simple as 'ls'.
It also means that our output could not be pasted as our input in
interactive programs or onto our command line, as we never did
translate in the DISPLAY -> UNIX direction.
The d_printf() calls are retained in case we need to revisit this, and
to support display_set_stderr().
Andrew Bartlett
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source4/param/util.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 67a782ded0..4ad555626a 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -209,7 +209,6 @@ static struct parm_struct parm_table[] = { {"dos charset", P_STRING, P_GLOBAL, GLOBAL_VAR(dos_charset), NULL, NULL}, {"unix charset", P_STRING, P_GLOBAL, GLOBAL_VAR(unix_charset), NULL, NULL}, {"ncalrpc dir", P_STRING, P_GLOBAL, GLOBAL_VAR(ncalrpc_dir), NULL, NULL}, - {"display charset", P_STRING, P_GLOBAL, GLOBAL_VAR(display_charset), NULL, NULL}, {"comment", P_STRING, P_LOCAL, LOCAL_VAR(comment), NULL, NULL}, {"path", P_STRING, P_LOCAL, LOCAL_VAR(szPath), NULL, NULL}, {"directory", P_STRING, P_LOCAL, LOCAL_VAR(szPath), NULL, NULL}, @@ -572,7 +571,6 @@ FN_GLOBAL_STRING(lockdir, szLockDir) FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir) FN_GLOBAL_STRING(dos_charset, dos_charset) FN_GLOBAL_STRING(unix_charset, unix_charset) -FN_GLOBAL_STRING(display_charset, display_charset) FN_GLOBAL_STRING(piddir, szPidDir) FN_GLOBAL_LIST(rndc_command, szRNDCCommand) FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand) diff --git a/source4/param/util.c b/source4/param/util.c index 139a8acc74..b1a7a571e6 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -296,7 +296,6 @@ struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx, { return smb_iconv_handle_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx), lpcfg_unix_charset(lp_ctx), - lpcfg_display_charset(lp_ctx), lpcfg_parm_bool(lp_ctx, NULL, "iconv", "native", true), old_ic); } |