diff options
| author | Alexander Bokovoy <ab@samba.org> | 2003-08-15 20:09:12 +0000 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2003-08-15 20:09:12 +0000 |
| commit | 7ddf760beabd61b180c10b6a5a45d472d432da93 (patch) | |
| tree | b17a234375322a6cea51204d191ec95ec942d292 /source3/param/loadparm.c | |
| parent | bb6fb2880b8f567871c590305447b682c0ce182c (diff) | |
| download | samba-7ddf760beabd61b180c10b6a5a45d472d432da93.tar.gz samba-7ddf760beabd61b180c10b6a5a45d472d432da93.tar.xz samba-7ddf760beabd61b180c10b6a5a45d472d432da93.zip | |
Fix charset detection code in configure.
Now we are:
1. Try to find correct name for default character sets for the platform
2. Use DEFAULT_{DOS|DISPLAY|UNIX}_CHARSET defines set during configure phase as defaults
This should fix CP850 problem on Solaris (at least) because it actually has IBM850 which
is the same but under different name
(This used to be commit 836b9fffa0eadc818019ba36ed764e97d4f9a801)
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 70efa8042b0..7982b87ffc6 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1310,18 +1310,18 @@ static void init_globals(void) string_set(&Globals.szGuestaccount, GUEST_ACCOUNT); /* using UTF8 by default allows us to support all chars */ - string_set(&Globals.unix_charset, "UTF8"); + string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET); #if defined(HAVE_NL_LANGINFO) && defined(CODESET) /* If the system supports nl_langinfo(), try to grab the value from the user's locale */ string_set(&Globals.display_charset, "LOCALE"); #else - string_set(&Globals.display_charset, "ASCII"); + string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET); #endif /* Use codepage 850 as a default for the dos character set */ - string_set(&Globals.dos_charset, "CP850"); + string_set(&Globals.dos_charset, DEFAULT_DOS_CHARSET); /* * Allow the default PASSWD_CHAT to be overridden in local.h. |