Merge fixes

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index b139cbcd661952e1ebe5aef0ecdf6a7c605706ed..9d3e18f39ddf4897d9ccf3b2369925e73d267650 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1487,7 +1487,7 @@ int getdirparams(const struct vol *vol,
                    (1 << DIRPBIT_FINFO)))) {
 
         ad_init(&ad, vol->v_adouble, vol->v_ad_options);
-        if ( !ad_metadata( upath, ADFLAGS_DIR, &ad) )
+        if ( !ad_metadata( upath, ADFLAGS_DIR, &ad) ) {
             isad = 1;
             if (ad.ad_md->adf_flags & O_CREAT) {
                 /* We just created it */

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index fba0eacf768a5ef1a4a003c4deccb9c6c7174cbc..c6fecadcafd8e733f7daed6a7f86751297b1c3a6 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -680,8 +680,6 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U
             rc = AFPERR_PARAM;
             goto exit;
         }
-        curdir->offcnt++;
-        sdir->offcnt--;
         /* if unix priv don't try to match perm with dest folder */
         if (!isdir && !vol_unix_priv(vol)) {
             int  admode = ad_mode("", 0777) | vol->v_fperm;