Zeroconf could not advertise non-ASCII time machine volume name, suggested by Oichi

diff --git a/NEWS b/NEWS
index cf67388f135ec46ff04a7dca171d8b8bb4c1f146..f2af096297296b74474007664fe1ef19416ab6eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Changes in 2.2.3
 * FIX: dbd: Don't remove BerkeleyDB if it's still in use by eg cnid_dbd, fixes
        bug introduced in 2.2.2
 * FIX: debian initscript: start avahi-daemon (if available) before atalkd
+* FIX: Zeroconf could not advertise non-ASCII time machine volume name
 
 Changes in 2.2.2
 ================

diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
index 837fa87ef7221bf576cad6a2c1fb3c64ab61bed9..83f73ff717195c8475c135181896964719334953 100644 (file)
--- a/etc/afpd/afp_avahi.c
+++ b/etc/afpd/afp_avahi.c
@@ -72,7 +72,7 @@ static void register_stuff(void) {
                
         for (volume = getvolumes(); volume; volume = volume->v_next) {
 
-            if (convert_string(CH_UCS2, CH_UTF8_MAC, volume->v_name, -1, tmpname, 255) <= 0) {
+            if (convert_string(CH_UCS2, CH_UTF8_MAC, volume->v_u8mname, -1, tmpname, 255) <= 0) {
                 LOG ( log_error, logtype_afpd, "Could not set Zeroconf volume name for TimeMachine");
                 goto fail;
             }

diff --git a/etc/afpd/afp_mdns.c b/etc/afpd/afp_mdns.c
index 2088402f05436013c0dd3724079574359213d942..6b2ba5bacbe5574ab42c605c447a8499258c65dc 100644 (file)
--- a/etc/afpd/afp_mdns.c
+++ b/etc/afpd/afp_mdns.c
@@ -138,7 +138,7 @@ static void register_stuff(const AFPConfig *configs) {
 
     for (volume = getvolumes(); volume; volume = volume->v_next) {
 
-        if (convert_string(CH_UCS2, CH_UTF8_MAC, volume->v_name, -1, tmpname, 255) <= 0) {
+        if (convert_string(CH_UCS2, CH_UTF8_MAC, volume->v_u8mname, -1, tmpname, 255) <= 0) {
             LOG ( log_error, logtype_afpd, "Could not set Zeroconf volume name for TimeMachine");
             goto fail;
         }