summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-09-30 01:30:15 +0000
committerAndrew Tridgell <tridge@samba.org>2003-09-30 01:30:15 +0000
commit9e0e0d67ca00ff518d65981be85a27b20d9ca258 (patch)
treed828eb9f4cf3f7f118b8c293fdfda38a2bafd7fc /source3
parent57c863190db9ac80529866ec6408bb03ef5e514c (diff)
downloadsamba-9e0e0d67ca00ff518d65981be85a27b20d9ca258.tar.gz
samba-9e0e0d67ca00ff518d65981be85a27b20d9ca258.tar.bz2
samba-9e0e0d67ca00ff518d65981be85a27b20d9ca258.zip
when we don't have a working iconv library we must default to using only builtin charsets. Defaulting to CP850 when we have just determined that it doesn't work just guarantees that Samba won't work at all (in fact it just seg faults at startup). This fixes Samba on AIX, and I expect on a bunch of other platforms.
(This used to be commit 9635a28181525e5e8cfb8ef77642446a0a4ba280)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 8c2e9e7f9b..8f6c8452e3 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1686,7 +1686,7 @@ done
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
AC_MSG_WARN([Sufficient support for iconv function was not found.
Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!])
- AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,"CP850",[Default dos charset name])
+ AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,"ASCII",[Default dos charset name])
AC_DEFINE_UNQUOTED(DEFAULT_DISPLAY_CHARSET,"ASCII",[Default display charset name])
AC_DEFINE_UNQUOTED(DEFAULT_UNIX_CHARSET,"UTF8",[Default unix charset name])
fi