Merge master

diff --cc etc/afpd/Makefile.am
Simple merge

diff --cc etc/afpd/afp_avahi.c
index f5eb73cde7c1cd1ee99257b23f824d558f11f87e,837fa87ef7221bf576cad6a2c1fb3c64ab61bed9..06dacd185960feda718d2bebb8de73655dae1fe9
--- 1/etc/afpd/afp_avahi.c
--- 2/etc/afpd/afp_avahi.c
+++ b/etc/afpd/afp_avahi.c
@@@ -20,8 -20,8 +20,9 @@@
  #include <atalk/util.h>
  #include <atalk/dsi.h>
  #include <atalk/unicode.h>
 +#include <atalk/netatalk_conf.h>
  
+ #include "afp_zeroconf.h"
  #include "afp_avahi.h"
  #include "afp_config.h"
  #include "volume.h"

diff --cc etc/afpd/afp_avahi.h
Simple merge

diff --cc etc/afpd/afp_options.c
index 3b37538b642c312f212f6e1821dc601d6da34a84,673e0bacb8baf11442a363be118f6befc0c040f9..6b1f24626f6520a3e3f69ac3b9cd2676a88fda6d
--- 1/etc/afpd/afp_options.c
--- 2/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@@ -154,9 -588,18 +154,11 @@@ static void show_version_extended(void 
  {
        show_version( );
  
 -      printf( "           SLP support:\t" );
 -#ifdef USE_SRVLOC
 -      puts( "Yes" );
 -#else
 -      puts( "No" );
 -#endif
 -
        printf( "      Zeroconf support:\t" );
- #ifdef USE_ZEROCONF
-       puts( "Yes" );
+ #if defined (HAVE_MDNS)
+       puts( "mDNSResponder" );
+ #elif defined (HAVE_AVAHI)
+       puts( "Avahi" );
  #else
        puts( "No" );
  #endif

diff --cc etc/afpd/afp_zeroconf.c
index 64347be3f330d18d7c458096f4b3b97adf321ddf,f8bbcf6fb4ed19297f954a4591c6f6141f157537..cf370fc3bf4b052a5defd159dcc40749fcc2bb2b
--- 1/etc/afpd/afp_zeroconf.c
--- 2/etc/afpd/afp_zeroconf.c
+++ b/etc/afpd/afp_zeroconf.c
@@@ -22,9 -24,13 +24,13 @@@
  /*
   * Functions (actually they are just facades)
   */
 -void zeroconf_register(const AFPConfig *configs)
 +void zeroconf_register(const AFPObj *configs)
  {
- #if defined (HAVE_AVAHI)
+ #if defined (HAVE_MDNS)
+   LOG(log_debug, logtype_afpd, "Attempting to register with mDNS using mDNSResponder");
+ 
+       md_zeroconf_register(configs);
+ #elif defined (HAVE_AVAHI)
    LOG(log_debug, logtype_afpd, "Attempting to register with mDNS using Avahi");
  
        av_zeroconf_register(configs);

diff --cc etc/afpd/afp_zeroconf.h
Simple merge

diff --cc etc/afpd/afs.c
index aebd1adbc52f00bacd1c022cdca3d8b23f5fa087,9d6835f4d79592f5dc5e774b31df38580437a0a4..f11d77eb22995a400ff43247cf7ddd4441babdbb
--- 1/etc/afpd/afs.c
--- 2/etc/afpd/afs.c
+++ b/etc/afpd/afs.c
@@@ -29,10 -29,7 +29,7 @@@
  #include "misc.h"
  #include "unix.h"
  
- int afs_getvolspace( vol, bfree, btotal, bsize )
- struct vol    *vol;
- VolSpace      *bfree, *btotal;
- uint32_t   *bsize;
 -int afs_getvolspace(struct vol *vol, VolSpace *bfree, VolSpace *btotal, u_int32_t *bsize)
++int afs_getvolspace(struct vol *vol, VolSpace *bfree, VolSpace *btotal, uint32_t *bsize)
  {
      struct ViceIoctl  vi;
      struct VolumeStatus       *vs;

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

diff --cc etc/afpd/auth.c
index 9f5034dc0551051a8a5d7fd861496d67eb2cbbea,40d3a5ac906b7e56a1de886dedd3f52a70f68546..2c466829488d30852c16585e4aae5969adba6ffb
--- 1/etc/afpd/auth.c
--- 2/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@@ -340,6 -407,14 +340,9 @@@ static int login(AFPObj *obj, struct pa
      obj->uid = geteuid();
      obj->logout = logout;
  
 -#ifdef FORCE_UIDGID
 -    obj->force_uid = 1;
 -    save_uidgid ( &obj->uidgid );
 -#endif
 -
+     /* pam_umask or similar might have changed our umask */
+     (void)umask(obj->options.umask);
+ 
      return( AFP_OK );
  }
  

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

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

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

diff --cc include/atalk/ldapconfig.h
Simple merge

diff --cc include/atalk/uuid.h
index 6cf872dd28ccd6bfac07ab8e2ab27de9cb406e50,024ac7a0535895a38f6841f2f9cfaeebf383eb00..4c9b3c95f8ff0225b503da0ae7bf3aeaa6d8e3ac
--- 1/include/atalk/uuid.h
--- 2/include/atalk/uuid.h
+++ b/include/atalk/uuid.h
@@@ -16,10 -16,8 +16,8 @@@
  #define AFP_UUID_H
  
  #define UUID_BINSIZE 16
- #define UUID_STRINGSIZE 36
- #define UUID_PRINTABLE_STRING_LENGTH 37
  
 -typedef unsigned char *uuidp_t;
 +typedef const unsigned char *uuidp_t;
  typedef unsigned char atalk_uuid_t[UUID_BINSIZE];
  
  typedef enum {UUID_USER   = 1,

diff --cc libatalk/acl/uuid.c
index 6df8d62b8b9ab0aae0c37adde0d150415a9d198f,4d8a875dc3d38a739814916d705d37a70635265b..83dd54581c481d3ed2ce03f983e55c2b8ffddbd8
--- 1/libatalk/acl/uuid.c
--- 2/libatalk/acl/uuid.c
+++ b/libatalk/acl/uuid.c
@@@ -103,12 -103,12 +104,12 @@@ void uuid_string2bin( const char *uuids
  
  /*!
   * Convert 16 byte binary uuid to neat ascii represantation including dashes.
-  *
+  * Use defined or default ascii mask for dash placement
   * Returns pointer to static buffer.
   */
 -const char *uuid_bin2string(unsigned char *uuid) {
 +const char *uuid_bin2string(const unsigned char *uuid) {
-     static char uuidstring[UUID_STRINGSIZE + 1];
- 
+     static char uuidstring[64];
+     const char *uuidmask;
      int i = 0;
      unsigned char c;
  

diff --cc libatalk/adouble/ad_sendfile.c
Simple merge

diff --cc macros/summary.m4
Simple merge

diff --cc macros/zeroconf.m4
Simple merge