Merge remote branch 'sf/product-2-2' into develop

[netatalk.git] / etc / afpd / enumerate.c

diff --git a/etc/afpd/enumerate.c b/etc/afpd/enumerate.c
index 021862e76a87e974ef54d399eff5f14527886c4a..d469928c357b465a5781d2f5f51c9aad51fb8a2e 100644 (file)
--- a/etc/afpd/enumerate.c
+++ b/etc/afpd/enumerate.c
@@ -353,7 +353,6 @@ static int enumerate(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_,
         s_path.u_name = sd.sd_last;
         if (ad_convert(sd.sd_last, &s_path.st, vol, &convname) == 0 && convname) {
             s_path.u_name = (char *)convname;
-            s_path.unconverted_name = sd.sd_last; /* Needed for CNID fixup */
         }
 
         if (of_stat( &s_path) < 0 ) {
@@ -405,7 +404,7 @@ static int enumerate(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_,
             }
             /* files are added to the dircache in getfilparams() -> getmetadata() */
             if (AFP_OK != ( ret = getfilparams(obj, vol, fbitmap, &s_path, curdir, 
-                                               data + header , &esz )) ) {
+                                               data + header, &esz, 1)) ) {
                 return( ret );
             }
         }