Merge branch 'develop' into nohex

[netatalk.git] / bin / ad / ad_util.c

diff --git a/bin/ad/ad_util.c b/bin/ad/ad_util.c
index 0143a1e4c7abb635c4e8e5c6f4cbdd19d5e204c2..682bc57c98190191bccdc5f6721315395b62d6d3 100644 (file)
--- a/bin/ad/ad_util.c
+++ b/bin/ad/ad_util.c
@@ -138,9 +138,10 @@ int openvol(AFPObj *obj, const char *path, afpvol_t *vol)
 
 void closevol(afpvol_t *vol)
 {
-    if (vol->vol->v_cdb)
+    if (vol->vol->v_cdb) {
         cnid_close(vol->vol->v_cdb);
-
+        vol->vol->v_cdb = NULL;
+    }
     memset(vol, 0, sizeof(afpvol_t));
 }
 
@@ -215,15 +216,6 @@ int convert_dots_encoding(const afpvol_t *svol, const afpvol_t *dvol, char *path
         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,