Merge remote branch 'sf/branch-allea' into branch-allea

diff --git a/config/afp.conf b/config/afp.conf
index 89745a694a35303adac8470cc4ea5a3c323f1f3e..a70b1b3e13f07594a7dcc2d0059765cf06cfe696 100644 (file)
--- a/config/afp.conf
+++ b/config/afp.conf
@@ -3,9 +3,13 @@
 ;
 
 [Global]
-
 ; Global server settings
 
+    unix charset = UTF8
+    vol charset = UTF8
+    mac charset = MAC_ROMAN
+
+
 ; [My AFP Volume]
 ;
 ; path = /path/to/volume

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 33baa64681bdf8e98ba10777c09ad7ba84fc99ea..fe33a21784f3eeb0125c33c99d0282c4f43f3665 100644 (file)
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -127,7 +127,7 @@ static const char *charset_name(charset_t ch)
         if (ln) {
             /* Check whether the charset name is supported
                by iconv */
-            LOG(log_info, logtype_default, "Locale charset is '%s'", ln);
+            LOG(log_debug, logtype_default, "Locale charset is '%s'", ln);
             atalk_iconv_t handle = atalk_iconv_open(ln, "UCS-2");
             if (handle == (atalk_iconv_t) -1) {
                 LOG(log_warning, logtype_default, "Locale charset '%s' unsupported, using ASCII instead", ln);