summaryrefslogtreecommitdiff
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-06-30 02:11:13 +0000
committerAndrew Tridgell <tridge@samba.org>2003-06-30 02:11:13 +0000
commit0a4959d48d62cd97d912182f99e0ea969d48253f (patch)
tree4d94514e2403709280096934f5ae58aeeab15e1b /source3/param/loadparm.c
parentb8723aaa65a2bd760d6d2d9c9409f7c39867484c (diff)
downloadsamba-0a4959d48d62cd97d912182f99e0ea969d48253f.tar.gz
samba-0a4959d48d62cd97d912182f99e0ea969d48253f.tar.bz2
samba-0a4959d48d62cd97d912182f99e0ea969d48253f.zip
- added LOCALE patch from vorlon@debian.org (Steve Langasek) (bug #122)
- changed --enable-developer debug to use -gstabs as it makes the samba binaries about 10x smaller and is still quite functional for samba debugging (This used to be commit 53bfcd478a193d4def8da872e92d7ed8f46aa4b9)
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index cee61f54cd..95f6896e6b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1281,8 +1281,13 @@ static void init_globals(void)
/* using UTF8 by default allows us to support all chars */
string_set(&Globals.unix_charset, "UTF8");
- /* using UTF8 by default allows us to support all chars */
+#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");
+#endif
/* Use codepage 850 as a default for the dos character set */
string_set(&Globals.dos_charset, "CP850");