Merge master

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

diff --cc include/atalk/adouble.h
index daa0b0ca94febafa2e5212cb5f7cc1efe7aa455b,18422eca680dc89c2950813d36cfe7ff97b50073..8e0b11e15a60e13ec935814f382c08fe7d6faf49
--- 1/include/atalk/adouble.h
--- 2/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@@ -33,26 -34,65 +33,24 @@@
  #include <config.h>
  #endif
  
 -/* -------------------
 - * need pread() and pwrite()
 - */
 -#ifdef HAVE_PREAD
 -
 -#ifndef HAVE_PWRITE
 -#undef HAVE_PREAD
 -#endif
 -
 -#endif
 -
 -#ifdef HAVE_PWRITE
 -#ifndef HAVE_PREAD
 -#undef HAVE_PWRITE
 -#endif
 -#endif
 -
 -/*
 -  Still have to figure out which platforms really
 -  need _XOPEN_SOURCE defined for pread.
 -*/
 -#if defined(HAVE_PREAD) && !defined(SOLARIS) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(TRU64)
 -#ifndef _XOPEN_SOURCE
 -#define _XOPEN_SOURCE 500
 -#endif
 -#endif
 -
 +#include <inttypes.h>
  #include <sys/types.h>
  #include <sys/stat.h>
 -
 -#ifdef HAVE_UNISTD_H
 -#undef __USE_MISC
 -#define __USE_MISC
  #include <unistd.h>
 -#endif
 -
 -#include <sys/cdefs.h>
 -
 -#ifdef HAVE_FCNTL_H
  #include <fcntl.h>
 -#endif
  
- #ifdef USE_MMAPPED_HEADERS
  #include <sys/mman.h>
- #endif
  
 -#ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
 -#endif
 -#include <netatalk/endian.h>
  
 -/* version info */
 -#define AD_VERSION1     0x00010000
 -#define SFM_VERSION     AD_VERSION1
 +#include <atalk/bstrlib.h>
 +#include <atalk/locking.h>
  
 +/* version info */
  #define AD_VERSION2     0x00020000
 -#define AD_VERSION2_OSX 0x00020001
 -/*
 -  #define AD_VERSION1_ADS 0x00010002
 -*/
 -#define AD_VERSION1_SFM 0x00010003
 +#define AD_VERSION_EA   0x00020002
 +
 +/* default */
  #define AD_VERSION      AD_VERSION2
  
  /*