Changeset 237 for branches/samba-3.2.x/source/param

Timestamp:

May 29, 2009, 8:29:38 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #85 (by diver) in 3.2 branch

File:

• branches/samba-3.2.x/source/param/loadparm.c (modified) (2 diffs)

branches/samba-3.2.x/source/param/loadparm.c

@@ -4613 +4613 @@
         string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
 #else
-        /* On OS/2, using UTF8 causes problems with display of foreign characters - default to SYSTEM codepage */
-        string_set(&Globals.unix_charset, "SYSTEM");
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to IBM-850 codepage */
+        string_set(&Globals.unix_charset, "IBM-850");
 #endif
 
@@ -4620 +4621 @@
         /* If the system supports nl_langinfo(), try to grab the value
            from the user's locale */
+#ifndef __OS2__
+        /* this does somehow not work on OS/2 */
         string_set(&Globals.display_charset, "LOCALE");
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to IBM-850 codepage */
+        string_set(&Globals.display_charset, "IBM-850");
+#endif  
+
 #else
         string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET);
 #endif
 
+#ifndef __OS2__
         /* Use codepage 850 as a default for the dos character set */
         string_set(&Globals.dos_charset, DEFAULT_DOS_CHARSET);
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to IBM-850 codepage */
+        string_set(&Globals.dos_charset, "IBM-850");
+#endif
+        /*
 
         /*