Alias charset 646 internally as it is same as ASCII. Should solve Solaris problems...

(This used to be commit c248cd4784ac0f8f16813de36d293ab6bf1d259b)

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index c09bff5fd7b87b6f0947147e98ae6305b9aba935..3d26d7e17c9b31b1c18f038e3d0e9026715182a1 100644 (file)
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -57,6 +57,7 @@ static struct charset_functions builtin_functions[] = {
        {"UCS-2LE",  iconv_copy, iconv_copy},
        {"UTF8",   utf8_pull,  utf8_push},
        {"ASCII", ascii_pull, ascii_push},
+       {"646", ascii_pull, ascii_push},
        {"UCS2-HEX", ucs2hex_pull, ucs2hex_push},
        {NULL, NULL, NULL}
 };