Merge from branch-2-1

diff --cc etc/afpd/acls.c
index 9a413be3547fa113574750e58bfa42199087fdae,4c2dcfafadc6d1aa988f642bb7052084ac362d1a..c8269c6a7fdb2fdf253526744d1d3562b2630805
--- 1/etc/afpd/acls.c
--- 2/etc/afpd/acls.c
+++ b/etc/afpd/acls.c
@@@ -1225,13 -946,16 +1225,16 @@@ int afp_setacl(AFPObj *obj, char *ibuf
  
          /* Check if its our job to preserve inherited ACEs */
          if (bitmap & kFileSec_Inherit)
 -            ret = set_acl_vfs(vol, s_path->u_name, 1, ibuf);
 +            ret = set_acl(vol, s_path->u_name, 1, ibuf);
          else
 -            ret = set_acl_vfs(vol, s_path->u_name, 0, ibuf);
 +            ret = set_acl(vol, s_path->u_name, 0, ibuf);
          if (ret == 0)
              ret = AFP_OK;
-         else
+         else {
+             LOG(log_warning, logtype_afpd, "afp_setacl(\"%s/%s\"): error",
+                 getcwdpath(), s_path->u_name);
              ret = AFPERR_MISC;
+         }
      }
  
      LOG(log_debug9, logtype_afpd, "afp_setacl: END");