Merge master

diff --cc config/Makefile.am
Simple merge

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

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

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

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

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

diff --cc include/atalk/adouble.h
index 8641aae75135cbc0caa5e5d6086bcde40cc13490,6d7e51a4e27f452f696001c3adc40854ebc37715..daa0b0ca94febafa2e5212cb5f7cc1efe7aa455b
--- 1/include/atalk/adouble.h
--- 2/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@@ -33,22 -34,67 +33,26 @@@
  #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>
 -#ifdef HAVE_SYS_TIME_H
+ #endif
+ 
  #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
  
  /*

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

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

diff --cc libatalk/dsi/dsi_getsess.c
index b8ff4944467becec4eeb035223024cf92cc71fe4,747a880a6442c247299a0e7d85643c8106eff448..180049f23fbf07c6fa980bef24e8afa9831e9d61
--- 1/libatalk/dsi/dsi_getsess.c
--- 2/libatalk/dsi/dsi_getsess.c
+++ b/libatalk/dsi/dsi_getsess.c
@@@ -15,9 -15,21 +15,11 @@@
  #include <errno.h>
  #include <unistd.h>
  #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
  
 -/* POSIX.1 sys/wait.h check */
  #include <sys/types.h>
 -#ifdef HAVE_SYS_WAIT_H
  #include <sys/wait.h>
 -#endif /* HAVE_SYS_WAIT_H */
 -#ifndef WEXITSTATUS
 -#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 -#endif /* ! WEXITSTATUS */
 -#ifndef WIFEXITED
 -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 -#endif /* ! WIFEXITED */
 -
  #include <sys/time.h>
  #include <atalk/logger.h>
  #include <atalk/util.h>

diff --cc libatalk/dsi/dsi_stream.c
Simple merge

diff --cc libatalk/util/server_child.c
Simple merge

diff --cc libatalk/util/server_ipc.c
Simple merge