Merge master

diff --cc libatalk/acl/cache.c
index 60ae653a44b6cd1e832565d344f3c3455395dfc7,c4635b57c46b5abede9d3b9fc6e593f0b615c86e..790e8c7ff69a6e7c21f869f867db197248499e7e
--- 1/libatalk/acl/cache.c
--- 2/libatalk/acl/cache.c
+++ b/libatalk/acl/cache.c
@@@ -117,9 -117,8 +117,8 @@@ static unsigned char hashuuid(uuidp_t u
  int add_cachebyname( const char *inname, const uuidp_t inuuid, const uuidtype_t type, const unsigned long uid _U_) {
      int ret = 0;
      char *name = NULL;
 -    uuidp_t uuid;
 +    unsigned char *uuid;
      cacheduser_t *cacheduser = NULL;
-     cacheduser_t *entry;
      unsigned char hash;
  
  #ifdef DEBUG