Merge master

diff --cc configure.in
Simple merge

diff --cc libatalk/acl/cache.c
index 790e8c7ff69a6e7c21f869f867db197248499e7e,585bb4801e8d4a727531f6ef3a4bff19f9d7c001..ee4d3f2295494306d54ca28853181e77ea8d93bd
--- 1/libatalk/acl/cache.c
--- 2/libatalk/acl/cache.c
+++ b/libatalk/acl/cache.c
@@@ -117,7 -117,7 +117,7 @@@ 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;
-     unsigned char *uuid;
 -    uuidp_t uuid = NULL;
++    unsigned char *uuid = NULL;
      cacheduser_t *cacheduser = NULL;
      unsigned char hash;
  
@@@ -315,7 -315,7 +315,7 @@@ int search_cachebyuuid( uuidp_t uuidp, 
  int add_cachebyuuid( uuidp_t inuuid, const char *inname, uuidtype_t type, const unsigned long uid _U_) {
      int ret = 0;
      char *name = NULL;
-     unsigned char *uuid;
 -    uuidp_t uuid = NULL;
++    unsigned char *uuid = NULL;
      cacheduser_t *cacheduser = NULL;
      cacheduser_t *entry;
      unsigned char hash;