summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-03-01 00:57:47 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-03-01 00:57:47 +0000
commit121d3238d72adc20bc08418d30eca1d41b4ff749 (patch)
tree47a3060c928586491fcc04a6d4719168b71052e6
parent5046ae9a670b7f0fee4ab493c5f9973807e4358b (diff)
downloadsamba-121d3238d72adc20bc08418d30eca1d41b4ff749.tar.gz
samba-121d3238d72adc20bc08418d30eca1d41b4ff749.tar.bz2
samba-121d3238d72adc20bc08418d30eca1d41b4ff749.zip
This should kill off the 'cannot convert' error messages on non-iconv hosts.
(This used to be commit 2a30960276ae65b60d01caf9464808d75a812e40)
-rw-r--r--source3/lib/charcnv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 97551ede1c..df98c5a20b 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -37,7 +37,7 @@ static char *charset_name(charset_t ch)
else if (ch == CH_UNIX) ret = lp_unix_charset();
else if (ch == CH_DOS) ret = lp_dos_charset();
else if (ch == CH_DISPLAY) ret = lp_display_charset();
- else if (ch == CH_UTF8) ret = "UTF-8";
+ else if (ch == CH_UTF8) ret = "UTF8";
if (!ret || !*ret) ret = "ASCII";
return ret;