Warning fixes.

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

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 367e94b47fbaae4cef35ff9c1815073671a7e815..6f9877719e6f45ccd3e8c683ef0b09ddc280a9a6 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -553,7 +553,7 @@ int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
     char       *oldname, *newname;
     char        *path, *p, *upath; 
     int                did, rc;
-    int                plen, retvalue;
+    int                plen;
     u_int16_t  vid;
 #if AD_VERSION > AD_VERSION1
     cnid_t      id;
@@ -674,8 +674,11 @@ int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
     }
 
 #ifdef DROPKLUDGE
-    if (retvalue=matchfile2dirperms (newname, vol, did) != AFP_OK)
-       return retvalue;
+    if (vol->v_flags & AFPVOL_DROPBOX) {
+        if (retvalue=matchfile2dirperms (newname, vol, did) != AFP_OK) {
+           return retvalue;
+        }
+    }
 #endif DROPKLUDGE
 
     if ( rc == AFP_OK ) {