Merge 2-2

diff --cc etc/afpd/file.c
Simple merge

diff --cc etc/afpd/fork.c
index 1c2164fa1aa5c89ac385b723a47101793558e7f7,33aaf66d1c025b1be90da8170b05376a2f988d81..3bdb5cdee2e9239e6123134e9d306d92d16875f4
--- 1/etc/afpd/fork.c
--- 2/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@@ -1171,7 -1238,8 +1173,8 @@@ static int write_fork(AFPObj *obj, cha
  
      /* offset can overflow on 64-bit capable filesystems.
       * report disk full if that's going to happen. */
 -     if (sum_neg(is64, offset, reqcount)) {
 +    if (sum_neg(is64, offset, reqcount)) {
+         LOG(log_error, logtype_afpd, "write_fork: DISK FULL");
          err = AFPERR_DFULL;
          goto afp_write_err;
      }

diff --cc etc/uams/uams_dhx_pam.c
Simple merge

diff --cc libatalk/cnid/dbd/cnid_dbd.c
Simple merge