X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bin%2Fad%2Fad_util.c;h=897bdf3b1415c609efdae24f2104d019ef3464fc;hb=bb90c6c56688f908a1d93125fec0941e1c79fed5;hp=d994f74f56afa666fe8376d142c882fcf6a83aaa;hpb=6f45d8eaada82e401ecde525c689a67148b3ba1e;p=netatalk.git

diff --git a/bin/ad/ad_util.c b/bin/ad/ad_util.c
index d994f74f..897bdf3b 100644
--- a/bin/ad/ad_util.c
+++ b/bin/ad/ad_util.c
@@ -211,20 +211,12 @@ int convert_dots_encoding(const afpvol_t *svol, const afpvol_t *dvol, char *path
     if ( ! svol->vol->v_path) {
         /* no source volume: escape special chars (eg ':') */
         from = dvol->vol->v_volcharset; /* src = dst charset */
-        flags |= CONV_ESCAPEHEX;
+        if (dvol->vol->v_adouble == AD_VERSION2)
+            flags |= CONV_ESCAPEHEX;
     } else {
         from = svol->vol->v_volcharset;
     }
 
-    if ( (svol->vol->v_path)
-         && ! (svol->vol->v_flags & AFPVOL_USEDOTS)
-         && (dvol->vol->v_flags & AFPVOL_USEDOTS)) {
-        /* source is without dots, destination is with */
-        flags |= CONV_UNESCAPEHEX;
-    } else if (! (dvol->vol->v_flags & AFPVOL_USEDOTS)) {
-        flags |= CONV_ESCAPEDOTS;
-    }
-
     int len = convert_charset(from,
                               dvol->vol->v_volcharset,
                               dvol->vol->v_maccharset,