Merge master

diff --cc configure.in
index 76b3065a75e7cb42a18c9dbfaadd0f065b948741,98d045d7ff8215a74d02bae1168a9f1f1b710279..9a06906c0600f07313b1541757b8f2247048fe82
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1252,17 -1254,8 +1252,9 @@@ f
  dnl --------------------- Netatalk Webmin
  NETATALK_WEBMIN
  
- dnl --------------------- Check for libuuid which is required for TimeMachine
- AC_SEARCH_LIBS([uuid_generate],
-                [uuid], ,
-                AC_MSG_ERROR([missing library libuuid required for TimeMachine]))
- AC_CHECK_HEADER([uuid/uuid.h],
-                 AC_DEFINE([HAVE_UUID], 1, [have libuuid]),
-                 AC_MSG_ERROR([missing header <uuid/uuid.> from libuuid required for TimeMachine]))
- 
  dnl --------------------- last minute substitutions
 -
 +dnl Request SUSv3 standard interfaces
 +CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D__EXTENSIONS__"
  AC_SUBST(LIBS)
  AC_SUBST(CFLAGS)
  AC_SUBST(OVERWRITE_CONFIG)

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

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

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

diff --cc libatalk/util/volinfo.c
index 3e639f09ff28837bfcdc37d2d931315b27094658,62afbc6559b490aa0d6c62a76380bc170aefe0c5..6dec61a0ccf4f817d91d9128be7629ea2469a6bf
--- 1/libatalk/util/volinfo.c
--- 2/libatalk/util/volinfo.c
+++ b/libatalk/util/volinfo.c
@@@ -294,20 -294,26 +294,19 @@@ static int parseline ( char *buf, struc
          }
          break;
        case CNID_DBPATH:
-         if ((vol->v_dbpath = strdup(value)) == NULL) {
-           fprintf (stderr, "strdup: %s", strerror(errno));
-             return -1;
-         }
+           if ((vol->v_dbpath = malloc(MAXPATHLEN+1)) == NULL)
+               return -1;
+           strcpy(vol->v_dbpath, value);
          break;
        case ADOUBLE_VER:
 -        if (strcasecmp(value, "v1") == 0) {
 -            vol->v_adouble = AD_VERSION1;
 -            vol->ad_path = ad_path;
 -        }
 -#if AD_VERSION == AD_VERSION2
 -        else if (strcasecmp(value, "v2") == 0) {
 +        if (strcasecmp(value, "v2") == 0) {
              vol->ad_path = ad_path;
              vol->v_adouble = AD_VERSION2;
 -        }
 -        else if (strcasecmp(value, "osx") == 0) {
 -            vol->v_adouble = AD_VERSION2_OSX;
 -            vol->ad_path = ad_path_osx;
 -        }
 -#endif
 -        else  {
 +        } else if (strcasecmp(value, "ea") == 0) {
 +            vol->ad_path = ad_path_ea;
 +            vol->v_adouble = AD_VERSION_EA;
 +        } else {
 +
            fprintf (stderr, "unknown adouble version: %s, %s", buf, value);
            return -1;
          }