summaryrefslogtreecommitdiff
path: root/source3/lib/iconv.c
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2003-09-15 12:42:10 +0000
committerAlexander Bokovoy <ab@samba.org>2003-09-15 12:42:10 +0000
commitf9b6d0fd108de242e0cb93218a8a344f927899c0 (patch)
treeee261cbe987bdbc1509ab463be5be6db308add5e /source3/lib/iconv.c
parentabdc2695e21285816bbcbf829560023a36b26ee8 (diff)
downloadsamba-f9b6d0fd108de242e0cb93218a8a344f927899c0.tar.gz
samba-f9b6d0fd108de242e0cb93218a8a344f927899c0.tar.bz2
samba-f9b6d0fd108de242e0cb93218a8a344f927899c0.zip
Alias charset 646 internally as it is same as ASCII. Should solve Solaris problems where ASCII was not detected and 646.so were requested through dynamic loading
(This used to be commit c248cd4784ac0f8f16813de36d293ab6bf1d259b)
Diffstat (limited to 'source3/lib/iconv.c')
-rw-r--r--source3/lib/iconv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index c09bff5fd7..3d26d7e17c 100644
--- 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}
};