summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-04-03 01:04:34 +0000
committerJeremy Allison <jra@samba.org>1998-04-03 01:04:34 +0000
commitf9c698b5eb6cd979591473bfab9ce1b9b71bb3fe (patch)
tree830349e771d1ea42efad9289c9463b2d7cc8e9c3
parentfd6dacbcdbbc2fbcb1e8f487cd58eefb4c24b982 (diff)
downloadsamba-f9c698b5eb6cd979591473bfab9ce1b9b71bb3fe.tar.gz
samba-f9c698b5eb6cd979591473bfab9ce1b9b71bb3fe.tar.bz2
samba-f9c698b5eb6cd979591473bfab9ce1b9b71bb3fe.zip
Fix from Josef Hinteregger <joehtg@joehtg.co.at> for using
character set = iso8859-1 with the new multibyte char code. Was always using sj_to_sj conversion in error. Jeremy. (This used to be commit e6a083451f8785fa1c00314a958007fe96fcc039)
-rw-r--r--source3/lib/kanji.c2
-rw-r--r--source3/param/loadparm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/kanji.c b/source3/lib/kanji.c
index 9360405547..994cf6e1bd 100644
--- a/source3/lib/kanji.c
+++ b/source3/lib/kanji.c
@@ -1108,7 +1108,7 @@ void interpret_coding_system(char *str)
} else if (strequal (str, "hex")) {
codes = HEX_CODE;
hex_tag = HEXTAG;
- } else if (strncasecmp (str, "hex", 3)) {
+ } else if (!strncasecmp (str, "hex", 3)) {
codes = HEX_CODE;
hex_tag = (str[3] ? str[3] : HEXTAG);
} else if (strequal (str, "j8bb")) {
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2527692bc5..20479bf96d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -62,7 +62,7 @@
* and 'coding system'.
*/
#ifndef KANJI
-#define KANJI "sjis"
+#define KANJI "sbcs"
#endif /* KANJI */
BOOL bLoaded = False;