Merge branch-2-1

diff --combined etc/afpd/auth.c
index fc12522b36ae504965b5538167c6e3707f4132b4,77e946ce3f02ff165f847e0c86d0c11f83107df3..0a5727fad0304babb30cb3f7a2fd23504adb5eb4
--- 1/etc/afpd/auth.c
--- 2/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@@ -46,7 -46,7 +46,7 @@@ extern void afp_get_cmdline( int *ac, c
  #include "status.h"
  #include "fork.h"
  #include "extattrs.h"
 -#ifdef HAVE_NFSv4_ACLS
 +#ifdef HAVE_ACLS
  #include "acls.h"
  #endif
  
@@@ -208,11 -208,11 +208,11 @@@ static int set_auth_switch(int expired
          afp_switch = postauth_switch;
          switch (afp_version) {
          case 32:
 -#ifdef HAVE_NFSv4_ACLS
 +#ifdef HAVE_ACLS
              uam_afpserver_action(AFP_GETACL, UAM_AFPSERVER_POSTAUTH, afp_getacl, NULL);
              uam_afpserver_action(AFP_SETACL, UAM_AFPSERVER_POSTAUTH, afp_setacl, NULL);
              uam_afpserver_action(AFP_ACCESS, UAM_AFPSERVER_POSTAUTH, afp_access, NULL);
 -#endif
 +#endif /* HAVE_ACLS */
              uam_afpserver_action(AFP_GETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_getextattr, NULL);
              uam_afpserver_action(AFP_SETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_setextattr, NULL);
              uam_afpserver_action(AFP_REMOVEATTR, UAM_AFPSERVER_POSTAUTH, afp_remextattr, NULL);
@@@ -261,7 -261,7 +261,7 @@@ static int login(AFPObj *obj, struct pa
          return AFPERR_NOTAUTH;
      }
  
-     LOG(log_note, logtype_afpd, "%2 Login by %s",
+     LOG(log_note, logtype_afpd, "%s Login by %s",
          afp_versions[afp_version_index].av_name, pwd->pw_name);
  
  #ifndef NO_DDP
@@@ -997,10 -997,10 +997,10 @@@ int afp_getuserinfo(AFPObj *obj _U_, ch
          *rbuflen += sizeof(id);
      }
  
 -#ifdef HAVE_NFSv4_ACLS
 +#ifdef HAVE_ACLS
      if (bitmap & USERIBIT_UUID) {
          int ret;
 -        uuid_t uuid;
 +        atalk_uuid_t uuid;
          char *uuidstring;
  
          if ( ! (obj->options.flags & OPTION_UUID))
@@@ -1019,7 -1019,7 +1019,7 @@@
          rbuf += UUID_BINSIZE;
          *rbuflen += UUID_BINSIZE;
      }
 -#endif
 +#endif /* HAVE_ACLS */
  
      LOG(log_debug, logtype_afpd, "END afp_getuserinfo:");
      return AFP_OK;