]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote branch 'netafp/master' into branch-allea
authorFrank Lahm <franklahm@googlemail.com>
Fri, 19 Aug 2011 09:56:52 +0000 (11:56 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 19 Aug 2011 09:56:52 +0000 (11:56 +0200)
34 files changed:
1  2 
configure.in
etc/afpd/acls.c
etc/afpd/afp_dsi.c
etc/afpd/afp_options.c
etc/afpd/auth.c
etc/afpd/directory.c
etc/afpd/main.c
etc/afpd/nfsquota.c
etc/afpd/quota.c
etc/afpd/status.c
etc/afpd/status.h
etc/afpd/uam.c
etc/afpd/unix.h
etc/afpd/volume.c
etc/cnid_dbd/cnid_metad.c
etc/cnid_dbd/comm.c
etc/cnid_dbd/main.c
include/atalk/adouble.h
include/atalk/dsi.h
include/atalk/globals.h
include/atalk/paths.h
include/atalk/util.h
include/atalk/uuid.h
libatalk/acl/uuid.c
libatalk/adouble/ad_lock.c
libatalk/compat/Makefile.am
libatalk/compat/misc.c
libatalk/dsi/dsi_stream.c
libatalk/unicode/util_unistr.c
libatalk/util/server_child.c
libatalk/util/server_ipc.c
libatalk/util/volinfo.c
macros/netatalk.m4
macros/quota-check.m4

diff --cc configure.in
index 78bdd2be7c2f55c37582c749fca3176b63d020a2,7c939c200f103d0394130a55e45cd53faebd0613..94320d9326646eb2b920dc0b510b509779e386a9
@@@ -302,14 -516,737 +302,15 @@@ CFLAGS="-I\$(top_srcdir)/include -I\$(t
  
  AC_DEFINE(OPEN_NOFOLLOW_ERRNO, ELOOP, errno returned by open with O_NOFOLLOW)
  
 +
  dnl --------------------------------------------------------------------------
 -dnl specific configuration comes in here:
 +dnl Last minute substitutions
  dnl --------------------------------------------------------------------------
 -dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu
 -
 -dnl --------------------- determine operating system from "target"
 -case "$host_os" in
 -      *aix*)                          this_os=aix ;;
 -      *freebsd*)                      this_os=freebsd ;;
 -      *hpux11*)                       this_os=hpux11 ;;
 -      *irix*)                         this_os=irix ;;
 -      *linux*)                        this_os=linux ;;
 -      *osx*)                          this_os=macosx ;;
 -      *darwin*)                       this_os=macosx ;;
 -      *netbsd*)                       this_os=netbsd ;;
 -      *openbsd*)                      this_os=openbsd ;;
 -      *osf*)                          this_os=tru64 ;;
 -      *solaris*)                      this_os=solaris ;;
 -esac
 -
 -case "$host_cpu" in
 -      i386|i486|i586|i686|k7)         this_cpu=x86 ;;
 -      alpha)                                          this_cpu=alpha ;;
 -      mips)                                           this_cpu=mips ;;
 -      powerpc|ppc)                            this_cpu=ppc ;;
 -esac
 -
 -dnl --------------------- GNU source
 -case "$this_os" in
 -      linux)  AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
 -        ;;
 -     *kfreebsd-gnu*) AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
 -        ;;
 -esac
 -
 -dnl --------------------- operating system specific flags (port from sys/*)
 -
 -dnl ----- AIX specific -----
 -if test x"$this_os" = "xaix"; then
 -      AC_MSG_RESULT([ * AIX specific configuration])
 -      AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
 -
 -      dnl This is probably a lie; AIX 4.3 supports a 64-bit long
 -      dnl compilation environment.  It's enough to get things defined
 -      dnl right in endian.h provided that long long is supported, though.
 -      AC_DEFINE(HAVE_32BIT_LONGS, 1, [Define if the data type long has 32 bit])
 -fi
 -
 -dnl ----- FreeBSD specific -----
 -if test x"$this_os" = "xfreebsd"; then 
 -      AC_MSG_RESULT([ * FreeBSD specific configuration])
 -      AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
 -      AC_DEFINE(FREEBSD, 1, [Define if OS is FreeBSD])
 -      AC_DEFINE(SENDFILE_FLAVOR_BSD, 1, [Define if the sendfile() function uses BSD semantics])
 -    AC_DEFINE(OPEN_NOFOLLOW_ERRNO, EMLINK, errno returned by open with O_NOFOLLOW)
 -fi
 -
 -dnl ----- HP-UX 11 specific -----
 -if test x"$this_os" = "xhpux11"; then
 -      AC_MSG_RESULT([ * HP-UX 11 specific configuration])
 -
 -      AC_DEFINE(_ISOC9X_SOURCE, 1, [Compatibility macro])
 -      AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
 -fi
 -
 -dnl ----- IRIX specific -----
 -if test x"$this_os" = "xirix"; then
 -      AC_MSG_RESULT([ * IRIX specific configuration])
 -
 -      AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
 -fi
 -
 -dnl ----- Linux specific -----
 -if test x"$this_os" = "xlinux"; then 
 -      AC_MSG_RESULT([ * Linux specific configuration])
 -      
 -      dnl ----- kernel 2.6 changed struct at_addr to atalk_addr
 -      AC_MSG_CHECKING([for struct atalk_addr])
 -dnl   AC_COMPILE_IFELSE([
 -      AC_TRY_COMPILE([
 -#include <sys/socket.h>
 -#include <asm/types.h>
 -#include <linux/atalk.h>
 -
 -      struct atalk_addr foo;
 -],
 -[ ], [
 -              ac_have_atalk_addr=yes
 -              AC_MSG_RESULT([yes])
 -      ], [
 -              AC_MSG_RESULT([no])
 -      ])
 -
 -if test "x$ac_have_atalk_addr" = "xyes"; then
 -      AC_DEFINE(HAVE_ATALK_ADDR, 1, [set if struct at_addr is called atalk_addr])
 -fi
 -
 -      dnl ----- check if we need the quotactl wrapper
 -#     AC_CHECK_HEADERS(sys/quota.h linux/quota.h)
 -#     AC_CHECK_FUNC(quotactl,,
 -#             AC_DEFINE(NEED_QUOTACTL_WRAPPER, 1, [Define if the quotactl wrapper is needed])
 -#             AC_MSG_RESULT([enabling quotactl wrapper])
 -#     )
 -
 -        # For quotas on Linux XFS filesystems
 -        
 -        # For linux > 2.5.56
 -        AC_CHECK_HEADERS(linux/dqblk_xfs.h,,
 -              [AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h)
 -              AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h)]
 -      )
 -
 -
 -      dnl ----- as far as I can tell, dbtob always does the wrong thing
 -      dnl ----- on every single version of linux I've ever played with.
 -      dnl ----- see etc/afpd/quota.c
 -      AC_DEFINE(HAVE_BROKEN_DBTOB, 1, [Define if dbtob is broken])
 -
 -      netatalk_cv_linux_sendfile=yes
 -      AC_MSG_CHECKING([use sendfile syscall])
 -        AC_ARG_ENABLE(sendfile,
 -          [  --disable-sendfile       disable linux sendfile syscall],[
 -              if test x"$enableval" = x"no"; then
 -                      netatalk_cv_linux_sendfile=no
 -                      AC_MSG_RESULT([no])
 -              else
 -                      AC_MSG_RESULT([yes])
 -
 -              fi
 -          ],[
 -              AC_MSG_RESULT([yes])
 -      ]
 -
 -       )
 -
 -      if test x"$netatalk_cv_linux_sendfile" = "xyes"; then 
 -          AC_CACHE_CHECK([for linux sendfile support],netatalk_cv_HAVE_SENDFILE,[
 -          AC_TRY_LINK([#include <sys/sendfile.h>],
 -[\
 -int tofd, fromfd;
 -off_t offset;
 -size_t total;
 -ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
 -],
 -netatalk_cv_HAVE_SENDFILE=yes,netatalk_cv_HAVE_SENDFILE=no)])
 -
 -# Try and cope with broken Linux sendfile....
 -          AC_CACHE_CHECK([for broken linux sendfile support],netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE,[
 -          AC_TRY_LINK([\
 -#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
 -#undef _FILE_OFFSET_BITS
 -#endif
 -#include <sys/sendfile.h>],
 -[\
 -int tofd, fromfd;
 -off_t offset;
 -size_t total;
 -ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
 -],
 -netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE=yes,netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE=no,netatalk_cv_HAVE_BROKEN_SENDFILE=cross)])
 -
 -          if test x"$netatalk_cv_HAVE_SENDFILE" = x"yes"; then
 -              AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
 -              AC_DEFINE(SENDFILE_FLAVOR_LINUX,1,[Whether linux sendfile() API is available])
 -              AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used])
 -          elif test x"$netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE" = x"yes"; then
 -              AC_DEFINE(SENDFILE_FLAVOR_LINUX,1,[Whether linux sendfile() API is available])
 -              AC_DEFINE(LINUX_BROKEN_SENDFILE_API,1,[Whether (linux) sendfile() is broken])
 -              AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile should be used])
 -          else
 -              netatalk_cv_linux_sendfile=no
 -              AC_MSG_RESULT(no);
 -          fi
 -      fi
 -
 -      dnl ----- Linux/alpha specific -----
 -      if test x"$this_cpu" = "xalpha"; then 
 -              AC_MSG_RESULT([enabling gcc memcpy bug workaround])
 -              AC_DEFINE(HAVE_GCC_MEMCPY_BUG, 1, [Define if memcpy is buggy])
 -      fi
 -      need_dash_r=no
 -
 -
 -fi
 -
 -dnl ----- Mac OSX specific -----
 -if test x"$this_os" = "xmacosx"; then 
 -      AC_MSG_RESULT([ * Mac OSX specific configuration])
 -      AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
 -      AC_DEFINE(HAVE_2ARG_DBTOB, 1, [Define if dbtob takes two arguments])
 -      dnl AC_DEFINE(NO_DLFCN_H)
 -      AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
 -      AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if Quota support should be disabled])
 -      AC_DEFINE(MACOSX_SERVER, 1, [Define if compiling for MacOS X Server])
 -fi
 -
 -dnl ----- NetBSD specific -----
 -if test x"$this_os" = "xnetbsd"; then 
 -      AC_MSG_RESULT([ * NetBSD specific configuration])
 -      AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
 -      AC_DEFINE(NETBSD, 1, [Define if OS is NetBSD])
 -    AC_DEFINE(OPEN_NOFOLLOW_ERRNO, EFTYPE, errno returned by open with O_NOFOLLOW)
 -
 -      CFLAGS="-I\$(top_srcdir)/sys/netbsd $CFLAGS"
 -      need_dash_r=yes 
 -
 -      dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
 -      AC_DEFINE(UAM_DHX, 1, [Define if the DHX UAM modules should be compiled])
 -fi
 -
 -dnl ----- OpenBSD specific -----
 -if test x"$this_os" = "xopenbsd"; then 
 -      AC_MSG_RESULT([ * OpenBSD specific configuration])
 -      dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
 -      AC_DEFINE(UAM_DHX, 1, [Define if the DHX UAM modules should be compiled])
 -fi
 -
 -dnl ----- Solaris specific -----
 -if test x"$this_os" = "xsolaris"; then 
 -      AC_MSG_RESULT([ * Solaris specific configuration])
 -      AC_DEFINE(__svr4__, 1, [Solaris compatibility macro])
 -      AC_DEFINE(_ISOC9X_SOURCE, 1, [Compatibility macro])
 -      AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
 -      AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro])
 -      CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
 -      need_dash_r=yes
 -      sysv_style=solaris
 -
 -      solaris_module=no
 -      AC_MSG_CHECKING([if we can build Solaris kernel module])
 -      if test -x /usr/ccs/bin/ld && test x"$netatalk_cv_ddp_enabled" = x"yes" ; then
 -              solaris_module=yes
 -      fi
 -      AC_MSG_RESULT([$solaris_module])
 -
 -      COMPILE_64BIT_KMODULE=no
 -      KCFLAGS=""
 -      KLDFLAGS=""
 -      COMPILE_KERNEL_GCC=no
 -
 -      if test "$solaris_module" = "yes"; then
 -         dnl Solaris kernel module stuff
 -           AC_MSG_CHECKING([if we have to build a 64bit kernel module])
 -
 -         # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)       
 -         if test -x /usr/bin/isainfo; then
 -              # check for 64 bit platform
 -              if isainfo -kv | grep '^64-bit'; then
 -                      COMPILE_64BIT_KMODULE=yes
 -              fi
 -         fi
 -
 -         AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
 -
 -         if test "${GCC}" = yes; then
 -              COMPILE_KERNEL_GCC=yes
 -              if test "$COMPILE_64BIT_KMODULE" = yes; then
 -              
 -                        AC_MSG_CHECKING([if we can build a 64bit kernel module])
 -                      
 -                        case `$CC --version 2>/dev/null` in
 -                      [[12]].* | 3.0.*)
 -                              COMPILE_64BIT_KMODULE=no
 -                              COMPILE_KERNEL_GCC=no   
 -                              solaris_module=no;;
 -                      *)
 -                              # use for 64 bit
 -                              KCFLAGS="-m64"
 -                              #KLDFLAGS="-melf64_sparc"
 -                              KLDFLAGS="-64";;
 -                      esac    
 -                      
 -                      AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
 -                      
 -              else
 -                      KCFLAGS=""
 -                      KLDFLAGS=""
 -              fi
 -              KCFLAGS="$KCFLAGS -D_KERNEL -Wall -Wstrict-prototypes"
 -           else
 -              if test "$COMPILE_64BIT_KMODULE" = yes; then
 -                # use Sun CC (for a 64-bit kernel, uncomment " -xarch=v9 -xregs=no%appl ")
 -                      KCFLAGS="-xarch=v9 -xregs=no%appl"
 -                      KLDFLAGS="-64"
 -              else
 -                      KCFLAGS=""
 -                      KLDFLAGS=""
 -              fi
 -              KCFLAGS="-D_KERNEL $KCFLAGS -mno-app-regs -munaligned-doubles -fpcc-struct-return"
 -         fi
 -
 -           AC_CACHE_CHECK([for timeout_id_t],netatalk_cv_HAVE_TIMEOUT_ID_T,[
 -           AC_TRY_LINK([\
 -#include <sys/stream.h>
 -#include <sys/ddi.h>],
 -[\
 -timeout_id_t dummy;
 -],
 -netatalk_cv_HAVE_TIMEOUT_ID_T=yes,netatalk_cv_HAVE_TIMEOUT_ID_T=no,netatalk_cv_HAVE_TIMEOUT_ID_T=cross)])
 -
 -         AC_DEFINE(HAVE_TIMEOUT_ID_T, test x"$netatalk_cv_HAVE_TIMEOUT_ID" = x"yes", [define for timeout_id_t])
 -      fi
 -
 -      AC_SUBST(COMPILE_KERNEL_GCC)
 -      AC_SUBST(COMPILE_64BIT_KMODULE)
 -      AC_SUBST(KCFLAGS)
 -      AC_SUBST(KLDFLAGS)
 -fi
 -
 -dnl ----- Tru64 specific -----
 -if test x"$this_os" = "xtru64"; then 
 -      AC_MSG_RESULT([ * Tru64 specific configuration])
 -      AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
 -      AC_DEFINE(HAVE_64BIT_LONGS, 1, [Define if the data type long has 64 bit])
 -      dnl AC_DEFINE(USE_MOUNT_H)
 -      AC_DEFINE(USE_OLD_RQUOTA, 1, [Define to use old rquota])
 -      dnl AC_DEFINE(USE_UFS_QUOTA_H)
 -      AC_DEFINE(TRU64, 1, [Define on Tru64 platforms])
 -      AC_DEFINE(_OSF_SOURCE, 1, [Define if the *passwd UAMs should be used])
 -      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Define for Berkeley DB 4])
 -      AC_CHECK_LIB(security,set_auth_parameters)
 -      CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS"
 -      need_dash_r=no
 -      sysv_style=tru64
 -fi
 -
 -dnl -- check for libgcrypt, if found enables DHX UAM
 -AM_PATH_LIBGCRYPT([1:1.2.3],[neta_cv_compile_dhx2=yes
 -                      neta_cv_have_libgcrypt=yes
 -                      AC_MSG_NOTICE([Enabling DHX2 UAM])
 -                      AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define if the DHX2 modules should be built with libgcrypt])
 -                      AC_DEFINE(UAM_DHX2, 1, [Define if the DHX2 UAM modules should be compiled])
 -                      ])
 -
 -dnl -- look for openssl, if found enables DHX UAM and Randnum UAM
 -AC_PATH_SSL
 -
 -dnl Check for Berkeley DB library
 -if test "x$bdb_required" = "xyes"; then
 -      AC_PATH_BDB(, [
 -              AC_MSG_RESULT([])
 -              AC_MSG_RESULT([Make sure you have the required Berkeley DB libraries AND headers installed.])
 -              AC_MSG_RESULT([You can download the latest version from http://www.sleepycat.com.])
 -              AC_MSG_RESULT([If you have installed BDB in a non standard location use the])
 -              AC_MSG_RESULT([--with-bdb=/path/to/bdb configure option and make sure])
 -              AC_MSG_RESULT([your linker is configured to check for libraries there.])
 -              AC_MSG_ERROR([Berkeley DB library required but not found!])
 -      ])
 -fi
 -
 -dnl -- check for crypt
 -AC_CRYPT
 -
 -dnl --------------------- check for building PGP UAM module
 -
 -AC_MSG_CHECKING([whether the PGP UAM should be build])
 -AC_ARG_ENABLE(pgp-uam,
 -      [  --enable-pgp-uam        enable build of PGP UAM module],[
 -      if test "$enableval" = "yes"; then 
 -              if test "x$neta_cv_have_openssl" = "xyes"; then 
 -                      AC_DEFINE(UAM_PGP, 1, [Define if the PGP UAM module should be compiled])
 -                      compile_pgp=yes
 -                      AC_MSG_RESULT([yes])
 -              else
 -                      AC_MSG_RESULT([no])
 -              fi
 -      fi
 -      ],[
 -              AC_MSG_RESULT([no])
 -      ]
 -)
 -
 -dnl --------------------- check for building Kerberos v4 UAM module
 -
 -AC_MSG_CHECKING([whether the Kerberos IV UAM should be build])
 -AC_ARG_ENABLE(krb4-uam,
 -      [  --enable-krb4-uam       enable build of Kerberos v4 UAM module],[
 -      if test "$enableval" = "yes"; then
 -              AC_DEFINE(UAM_KRB4, 1, [Define if the Kerberos 4 UAM module should be compiled])
 -              compile_kerberos=yes
 -              AC_MSG_RESULT([yes])
 -      else
 -              AC_MSG_RESULT([no])
 -      fi
 -      ],[
 -              AC_MSG_RESULT([no])
 -      ]
 -)
 -
 -dnl --------------------- check for building Kerberos V UAM module
 -
 -netatalk_cv_build_krb5_uam=no
 -AC_ARG_ENABLE(krbV-uam,
 -      [  --enable-krbV-uam       enable build of Kerberos V UAM module],
 -      [
 -              if test x"$enableval" = x"yes"; then
 -                      NETATALK_GSSAPI_CHECK([
 -                              netatalk_cv_build_krb5_uam=yes
 -                      ],[
 -                              AC_MSG_ERROR([need GSSAPI to build Kerberos V UAM])
 -                      ])
 -              fi
 -      ]
 -      
 -)
 -
 -AC_MSG_CHECKING([whether Kerberos V UAM should be build])
 -if test x"$netatalk_cv_build_krb5_uam" = x"yes"; then
 -      AC_MSG_RESULT([yes])
 -else
 -      AC_MSG_RESULT([no])
 -fi
 -AM_CONDITIONAL(USE_GSSAPI, test x"$netatalk_cv_build_krb5_uam" = x"yes")
 -
 -dnl --------------------- overwrite the config files . . . or not.
 -
 -AC_MSG_CHECKING([whether configuration files should be overwritten])
 -AC_ARG_ENABLE(overwrite,
 -      [  --enable-overwrite      overwrite configuration files during installation],
 -      [OVERWRITE_CONFIG="${enable_overwrite}"],
 -      [OVERWRITE_CONFIG="no"]
 -)
 -AC_MSG_RESULT([$OVERWRITE_CONFIG])
 -
 -dnl --------------------- check for LDAP support, for client-side ACL visibility
 -AC_MSG_CHECKING(for LDAP (necessary for client-side ACL visibility))
 -AC_ARG_WITH(ldap,
 -    [AS_HELP_STRING([--with-ldap],
 -        [LDAP support (default=auto)])],
 -    [ case "$withval" in
 -      yes|no)
 -          with_ldap="$withval"
 -                ;;
 -      *)
 -          with_ldap=auto
 -          ;;
 -      esac ])
 -AC_MSG_RESULT($with_ldap)
 -
 -if test x"$with_ldap" != x"no" ; then
 -      AC_CHECK_HEADER([ldap.h], with_ldap=yes,
 -        [ if test x"$with_ldap" = x"yes" ; then
 -            AC_MSG_ERROR([Missing LDAP headers])
 -        fi
 -              with_ldap=no
 -        ])
 -      AC_CHECK_LIB(ldap, ldap_init, with_ldap=yes,
 -        [ if test x"$with_ldap" = x"yes" ; then
 -            AC_MSG_ERROR([Missing LDAP library])
 -        fi
 -              with_ldap=no
 -        ])
 -fi
 -
 -if test x"$with_ldap" = x"yes"; then
 -      AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
 -fi
 -
 -dnl --------------------- check for ACL support
 -AC_MSG_CHECKING(whether to support ACLs)
 -AC_ARG_WITH(acls,
 -    [AS_HELP_STRING([--with-acls],
 -        [Include ACL support (default=auto)])],
 -    [ case "$withval" in
 -      yes|no)
 -          with_acl_support="$withval"
 -                ;;
 -      *)
 -          with_acl_support=auto
 -          ;;
 -      esac ],
 -    [with_acl_support=auto])
 -AC_MSG_RESULT($with_acl_support)
 -
 -if test x"$with_acl_support" = x"no"; then
 -      AC_MSG_RESULT(Disabling ACL support)
 -      AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
 -else
 -    with_acl_support=yes
 -fi
 -
 -if test x"$with_acl_support" = x"yes" ; then
 -      AC_MSG_NOTICE(checking whether ACL support is available:)
 -      case "$host_os" in
 -      *sysv5*)
 -              AC_MSG_NOTICE(Using UnixWare ACLs)
 -              AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
 -              ;;
 -      *solaris*)
 -              AC_MSG_NOTICE(Using solaris ACLs)
 -              AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
 -              ACL_LIBS="$ACL_LIBS -lsec"
 -              ;;
 -      *hpux*)
 -              AC_MSG_NOTICE(Using HPUX ACLs)
 -              AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
 -              ;;
 -      *irix*)
 -              AC_MSG_NOTICE(Using IRIX ACLs)
 -              AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
 -              ;;
 -      *aix*)
 -              AC_MSG_NOTICE(Using AIX ACLs)
 -              AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
 -              ;;
 -      *osf*)
 -              AC_MSG_NOTICE(Using Tru64 ACLs)
 -              AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
 -              ACL_LIBS="$ACL_LIBS -lpacl"
 -              ;;
 -      *darwin*)
 -              AC_MSG_NOTICE(ACLs on Darwin currently not supported)
 -              AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
 -              ;;
 -      *)
 -              AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
 -              case "$host_os" in
 -              *linux*)
 -                      AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
 -                      ;;
 -              esac
 -              AC_CACHE_CHECK([for POSIX ACL support],netatalk_cv_HAVE_POSIX_ACLS,[
 -                      acl_LIBS=$LIBS
 -                      LIBS="$LIBS $ACL_LIBS"
 -                      AC_TRY_LINK([
 -                              #include <sys/types.h>
 -                              #include <sys/acl.h>
 -                      ],[
 -                              acl_t acl;
 -                              int entry_id;
 -                              acl_entry_t *entry_p;
 -                              return acl_get_entry(acl, entry_id, entry_p);
 -                      ],
 -                      [netatalk_cv_HAVE_POSIX_ACLS=yes],
 -                      [netatalk_cv_HAVE_POSIX_ACLS=no
 -                with_acl_support=no])
 -                      LIBS=$acl_LIBS
 -              ])
 -              if test x"$netatalk_cv_HAVE_POSIX_ACLS" = x"yes"; then
 -                      AC_MSG_NOTICE(Using POSIX ACLs)
 -                      AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
 -                      AC_CACHE_CHECK([for acl_get_perm_np],netatalk_cv_HAVE_ACL_GET_PERM_NP,[
 -                              acl_LIBS=$LIBS
 -                              LIBS="$LIBS $ACL_LIBS"
 -                              AC_TRY_LINK([
 -                                      #include <sys/types.h>
 -                                      #include <sys/acl.h>
 -                              ],[
 -                                      acl_permset_t permset_d;
 -                                      acl_perm_t perm;
 -                                      return acl_get_perm_np(permset_d, perm);
 -                              ],
 -                              [netatalk_cv_HAVE_ACL_GET_PERM_NP=yes],
 -                              [netatalk_cv_HAVE_ACL_GET_PERM_NP=no])
 -                              LIBS=$acl_LIBS
 -                      ])
 -                      if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
 -                              AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
 -                      fi
 -
 -                      AC_CACHE_CHECK([for acl_from_mode], netatalk_cv_HAVE_ACL_FROM_MODE,[
 -                              acl_LIBS=$LIBS
 -                              LIBS="$LIBS $ACL_LIBS"
 -                AC_CHECK_FUNCS(acl_from_mode,
 -                              [netatalk_cv_HAVE_ACL_FROM_MODE=yes],
 -                              [netatalk_cv_HAVE_ACL_FROM_MODE=no])
 -                              LIBS=$acl_LIBS
 -                      ])
 -                      if test x"netatalk_cv_HAVE_ACL_FROM_MODE" = x"yes"; then
 -                              AC_DEFINE(HAVE_ACL_FROM_MODE,1,[Whether acl_from_mode() is available])
 -                      fi
 -
 -
 -              else
 -                      AC_MSG_NOTICE(ACL support is not avaliable)
 -                      AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
 -              fi
 -              ;;
 -    esac
 -fi
 -
 -if test x"$with_acl_support" = x"yes" ; then
 -   AC_CHECK_HEADERS([acl/libacl.h])
 -    AC_DEFINE(HAVE_ACLS,1,[Whether ACLs support is available])
 -    AC_SUBST(ACL_LIBS)
 -fi
 -
 -dnl --------------------- check for Extended Attributes support
 -neta_cv_eas="ad"
 -neta_cv_eas_sys_found=no
 -neta_cv_eas_sys_not_found=no
 -
 -AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h sys/ea.h)
 -
 -case "$this_os" in
 -
 -  *osf*)
 -      AC_SEARCH_LIBS(getproplist, [proplist])
 -      AC_CHECK_FUNCS([getproplist fgetproplist setproplist fsetproplist],
 -                   [neta_cv_eas_sys_found=yes],
 -                   [neta_cv_eas_sys_not_found=yes])
 -      AC_CHECK_FUNCS([delproplist fdelproplist add_proplist_entry get_proplist_entry],,
 -                   [neta_cv_eas_sys_not_found=yes])
 -      AC_CHECK_FUNCS([sizeof_proplist_entry],,
 -                   [neta_cv_eas_sys_not_found=yes])
 -  ;;
 -
 -  *solaris*)
 -      AC_CHECK_FUNCS([attropen],
 -                   [neta_cv_eas_sys_found=yes],
 -                   [neta_cv_eas_sys_not_found=yes])
 -  ;;
 -
 -  'freebsd')
 -    AC_CHECK_FUNCS([extattr_delete_fd extattr_delete_file extattr_delete_link],
 -                   [neta_cv_eas_sys_found=yes],
 -                   [neta_cv_eas_sys_not_found=yes])
 -    AC_CHECK_FUNCS([extattr_get_fd extattr_get_file extattr_get_link],,
 -                   [neta_cv_eas_sys_not_found=yes])
 -    AC_CHECK_FUNCS([extattr_list_fd extattr_list_file extattr_list_link],,
 -                   [neta_cv_eas_sys_not_found=yes])
 -    AC_CHECK_FUNCS([extattr_set_fd extattr_set_file extattr_set_link],,
 -                   [neta_cv_eas_sys_not_found=yes])
 -  ;;
 -
 -  *freebsd4* | *dragonfly* )
 -    AC_DEFINE(BROKEN_EXTATTR, 1, [Does extattr API work])
 -  ;;
 -
 -  *)
 -      AC_SEARCH_LIBS(getxattr, [attr])
 -
 -    if test "x$neta_cv_eas_sys_found" != "xyes" ; then
 -       AC_CHECK_FUNCS([getxattr lgetxattr fgetxattr listxattr llistxattr],
 -                      [neta_cv_eas_sys_found=yes],
 -                      [neta_cv_eas_sys_not_found=yes])
 -         AC_CHECK_FUNCS([flistxattr removexattr lremovexattr fremovexattr],,
 -                      [neta_cv_eas_sys_not_found=yes])
 -         AC_CHECK_FUNCS([setxattr lsetxattr fsetxattr],,
 -                      [neta_cv_eas_sys_not_found=yes])
 -    fi
 -
 -    if test "x$neta_cv_eas_sys_found" != "xyes" ; then
 -         AC_CHECK_FUNCS([getea fgetea lgetea listea flistea llistea],
 -                      [neta_cv_eas_sys_found=yes],
 -                      [neta_cv_eas_sys_not_found=yes])
 -         AC_CHECK_FUNCS([removeea fremoveea lremoveea setea fsetea lsetea],,
 -                      [neta_cv_eas_sys_not_found=yes])
 -    fi
 -
 -    if test "x$neta_cv_eas_sys_found" != "xyes" ; then
 -         AC_CHECK_FUNCS([attr_get attr_list attr_set attr_remove],,
 -                      [neta_cv_eas_sys_not_found=yes])
 -       AC_CHECK_FUNCS([attr_getf attr_listf attr_setf attr_removef],,
 -                      [neta_cv_eas_sys_not_found=yes])
 -    fi
 -  ;;
 -esac
 -
 -# Do xattr functions take additional options like on Darwin?
 -if test x"$ac_cv_func_getxattr" = x"yes" ; then
 -      AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt, [
 -              old_LIBS=$LIBS
 -              LIBS="$LIBS $ACL_LIBS"
 -              AC_TRY_COMPILE([
 -                      #include <sys/types.h>
 -                      #if HAVE_ATTR_XATTR_H
 -                      #include <attr/xattr.h>
 -                      #elif HAVE_SYS_XATTR_H
 -                      #include <sys/xattr.h>
 -                      #endif
 -              ],[
 -                      getxattr(0, 0, 0, 0, 0, 0);
 -              ],
 -              [smb_attr_cv_xattr_add_opt=yes],
 -              [smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS])
 -      ])
 -      if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
 -              AC_DEFINE(XATTR_ADD_OPT, 1, [xattr functions have additional options])
 -      fi
 -fi
 -
 -if test "x$neta_cv_eas_sys_found" = "xyes" ; then
 -   if test "x$neta_cv_eas_sys_not_found" != "xyes" ; then
 -      neta_cv_eas="$neta_cv_eas | sys"
 -   fi
 -fi
 -AC_DEFINE_UNQUOTED(EA_MODULES,["$neta_cv_eas"],[Available Extended Attributes modules])
 -
 -dnl --------------------- Check if realpath() takes NULL
 -AC_CACHE_CHECK([if the realpath function allows a NULL argument],
 -    neta_cv_REALPATH_TAKES_NULL, [
 -        AC_TRY_RUN([
 -            #include <stdio.h>
 -            #include <limits.h>
 -            #include <signal.h>
 -
 -            void exit_on_core(int ignored) {
 -                 exit(1);
 -            }
 -
 -            main() {
 -                char *newpath;
 -                signal(SIGSEGV, exit_on_core);
 -                newpath = realpath("/tmp", NULL);
 -                exit((newpath != NULL) ? 0 : 1);
 -            }],
 -            neta_cv_REALPATH_TAKES_NULL=yes,
 -            neta_cv_REALPATH_TAKES_NULL=no,
 -            neta_cv_REALPATH_TAKES_NULL=cross
 -        )
 -    ]
 -)
 -
 -if test x"$neta_cv_REALPATH_TAKES_NULL" = x"yes"; then
 -    AC_DEFINE(REALPATH_TAKES_NULL,1,[Whether the realpath function allows NULL])
 -fi
 -
 -dnl --------------------- Netatalk Webmin
 -NETATALK_WEBMIN
 -
 -dnl --------------------- last minute substitutions
 -
  AC_SUBST(LIBS)
  AC_SUBST(CFLAGS)
 -AC_SUBST(OVERWRITE_CONFIG)
  
  AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 -AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
 -AM_CONDITIONAL(COMPILE_A2BOOT, test x$compile_a2boot = xyes)
  AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes)
  AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes)
  AM_CONDITIONAL(HAVE_ACLS, test x"$with_acl_support" = x"yes")
diff --cc etc/afpd/acls.c
Simple merge
Simple merge
Simple merge
diff --cc etc/afpd/auth.c
Simple merge
Simple merge
diff --cc etc/afpd/main.c
index 68785537e3d7c945e7035577989a5aa3e73a47f7,b29510ba263ad1a51673be4ee39c3eb3a533951f..43335885fcb1948509b5c4541bcc53c07c5b185a
@@@ -52,10 -51,11 +52,12 @@@ static int argc = 0
  static char **argv = NULL;
  #endif /* TRU64 */
  
- unsigned char nologin = 0;
+ #define AFP_LISTENERS 32
+ #define FDSET_SAFETY  5
  
+ unsigned char nologin = 0;
  struct afp_options default_options;
 +
  static AFPConfig *configs;
  static server_child *server_children;
  static sig_atomic_t reloadconfig = 0;
@@@ -359,17 -393,16 +391,22 @@@ int main(int ac, char **av
      }
      pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
  
 -    /* Register CNID  */
 +    /* Initialize */
      cnid_init();
 -
 +    if (locktable_init("XXX") != 0)
 +        exit(EXITERR_SYS);
 +#if 0
 +    if (rpc_init("127.0.0.1", 4701) != 0)
 +        exit(EXITERR_SYS);
 +#endif
 +    
      /* watch atp, dsi sockets and ipc parent/child file descriptor. */
-     disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
+     if (default_options.flags & OPTION_KEEPSESSIONS) {
+         LOG(log_note, logtype_afpd, "Activating continous service");
+         disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
+     }
      fd_set_listening_sockets();
  
      /* set limits */
index 90b84c21e5cf1a16dd7de8724130c1b1dca04f3b,28e61695722f402dc6bb1e8c806d62da60be3243..b250c16633991d0a6a36a365f1cd48c585220bdb
  #include "config.h"
  #endif /* HAVE_CONFIG_H */
  
- #ifndef NO_QUOTA_SUPPORT
+ #if !defined(NO_QUOTA_SUPPORT) && !defined(HAVE_LIBQUOTA)
  #include <stdio.h>
 -/* STDC check */
 -#if STDC_HEADERS
  #include <string.h>
 -#else /* STDC_HEADERS */
 -#ifndef HAVE_STRCHR
 -#define strchr index
 -#define strrchr index
 -#endif /* HAVE_STRCHR */
 -char *strchr (), *strrchr ();
 -#ifndef HAVE_MEMCPY
 -#define memcpy(d,s,n) bcopy ((s), (d), (n))
 -#define memmove(d,s,n) bcopy ((s), (d), (n))
 -#endif /* ! HAVE_MEMCPY */
 -#endif /* STDC_HEADERS */
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/param.h> /* for DEV_BSIZE */
Simple merge
Simple merge
Simple merge
diff --cc etc/afpd/uam.c
Simple merge
diff --cc etc/afpd/unix.h
index a3d234ba9abc378a3442e7635b11313a5f1544fe,be7b7bfb4aa5bd3f8848f9ce4c31be1f80306c0e..dcf45c821537d79332523d2070a05c42f6b3dceb
@@@ -202,11 -209,12 +203,12 @@@ extern long quotactl (unsigned int, con
  
  #endif /* linux */
  
 -extern int getnfsquota (struct vol *, const int, const u_int32_t,
 -                                struct dqblk *);
 +extern int getnfsquota (struct vol *, const int, const uint32_t,
 +                        struct dqblk *);
  
+ #endif /* ! HAVE_LIBQUOTA */
  extern int uquota_getvolspace (struct vol *, VolSpace *, VolSpace *,
 -                                       const u_int32_t);
 +                               const uint32_t);
  #endif /* NO_QUOTA_SUPPORT */
  
  extern struct afp_options default_options;
Simple merge
Simple merge
Simple merge
Simple merge
index 5de2b4ebf169fdf6c7794943352e5bbf1408832c,278dd4ba26ccffaed8044cdaab0cd1b90a398ac9..963417bd32b16ff6e4569c3c4b034dc693e21ba0
  #error bad size for AD_DATASZ2
  #endif
  
 -#define AD_DATASZ_MAX   1024
 -#if AD_VERSION == AD_VERSION1
 -#define AD_DATASZ   AD_DATASZ1 /* hold enough for the entries */
 -#elif AD_VERSION == AD_VERSION2
 -#define AD_DATASZ   AD_DATASZ2
 +#define AD_DATASZ_EA (AD_HEADER_LEN + (ADEID_NUM_EA * AD_ENTRY_LEN) + ADEDLEN_FINDERI + \
 +                      ADEDLEN_COMMENT + ADEDLEN_FILEDATESI + ADEDLEN_AFPFILEI + ADEDLEN_PRIVID)
 +
 +#if AD_DATASZ_EA != 342
 +#error bad size for AD_DATASZ_EA
  #endif
  
 -/*
 - * some legacy defines from netatalk-990130
 - * (to keep from breaking certain packages)
 - *
 - */
 +#define AD_DATASZ_MAX   1024
  
 -#define ADEDOFF_RFORK   589
 -#define ADEDOFF_NAME    86
 -#define ADEDOFF_COMMENT 341
 -#define ADEDOFF_FINDERI 557
 -#ifndef ADEDOFF_FILEI
 -#define ADEDOFF_FILEI   541
 +#if AD_VERSION == AD_VERSION2
 +#define AD_DATASZ   AD_DATASZ2
 +#elif AD_VERSION == AD_VERSION_EA
 +#define AD_DATASZ   AD_DATASZ_EA
  #endif
  
 -typedef u_int32_t cnid_t;
 +#define RFORK_EA_ALLOCSIZE (128*1024) /* 128k */
  
 -/*
 - * The header of the AppleDouble Header File looks like this:
 - *
 - *  NAME            SIZE
 - *  ====            ====
 - *  Magic           4
 - *  Version         4
 - *  Home File System    16  (this becomes filler in ad v2)
 - *  Number of Entries   2
 - *  Entry Descriptors for each entry:
 - *      Entry ID    4
 - *      Offset      4
 - *      Length      4
 - */
 +typedef uint32_t cnid_t;
  
  struct ad_entry {
-     uint32_t   ade_off;
-     uint32_t   ade_len;
 -    off_t   ade_off;
++    off_t     ade_off;
+     ssize_t   ade_len;
  };
  
  typedef struct adf_lock_t {
Simple merge
index 3f65fbad2f484bb087edc5aeb03b9f95605a6019,299a5bf5d99748c69ac299a1aed3fa3c91c001f2..aa20d25e91bf6da857e40d3d104769854d874156
  #define OPTION_UUID          (1 << 7)
  #define OPTION_ACL2MACCESS   (1 << 8)
  #define OPTION_NOZEROCONF    (1 << 9)
+ #define OPTION_KEEPSESSIONS  (1 << 10) /* preserve sessions across master afpd restart with SIGQUIT */
  
 -#ifdef FORCE_UIDGID
 -/* set up a structure for this */
 -typedef struct uidgidset_t {
 -    uid_t uid;
 -    gid_t gid;
 -} uidgidset;
 -#endif /* FORCE_UIDGID */
 -
  /* a couple of these options could get stuck in unions to save
   * space. */
  struct afp_volume_name {
@@@ -56,11 -66,13 +57,12 @@@ struct afp_options 
      int connections, transports, tickleval, timeout, server_notif, flags, dircachesize;
      int sleep;                  /* Maximum time allowed to sleep (in tickles) */
      int disconnected;           /* Maximum time in disconnected state (in tickles) */
+     int fce_fmodwait;           /* number of seconds FCE file mod events are put on hold */
      unsigned int tcp_sndbuf, tcp_rcvbuf;
      unsigned char passwdbits, passwdminlen, loginmaxfail;
 -    u_int32_t server_quantum;
 +    uint32_t server_quantum;
      int dsireadbuf; /* scale factor for sizefof(dsi->buffer) = server_quantum * dsireadbuf */
      char hostname[MAXHOSTNAMELEN + 1], *server, *ipaddr, *port, *configfile;
 -    struct at_addr ddpaddr;
      char *uampath, *fqdn;
      char *pidfile;
      char *sigconffile;
Simple merge
Simple merge
index ba47fd09a224db3eb73c424d4bc253198216b8da,93bad6b31df7358b598e6b72003173d2e0136c5a..941930d328d9020491605f81f7d59592952441a9
  #define UUID_BINSIZE 16
  #define UUID_STRINGSIZE 36
  
 -typedef unsigned char *uuidp_t;
 +typedef const unsigned char *uuidp_t;
  typedef unsigned char atalk_uuid_t[UUID_BINSIZE];
  
- typedef enum {UUID_USER   = 0,
-               UUID_GROUP  = 1,
+ typedef enum {UUID_USER   = 1,
+               UUID_GROUP  = 2,
                UUID_ENOENT = 4} /* used as bit flag */
      uuidtype_t;
  #define UUIDTYPESTR_MASK 3
Simple merge
Simple merge
index 2338cf39721da572cc2ad4e0d77de2525d97e4c8,6540debf33a7eabc8f0816346a1d609e74b0fc4a..ed54763cb6958880c0a39f5c455b485f17f55e10
@@@ -3,8 -3,13 +3,10 @@@
  noinst_LTLIBRARIES = libcompat.la
  
  libcompat_la_SOURCES =        \
+       misc.c \
+       mktemp.c        \
        getusershell.c  \
 -      strcasecmp.c    \
 -      strstr.c        \
 -      strdup.c        \
 -      inet_aton.c     \
        rquota_xdr.c    \
 -      pselect.c       \
 -      snprintf.c
 +      pselect.c               \
 +      strlcpy.c               \
 +      misc.c
index 2fe6a7f3cfc6adec921b2a7a8ea9a53d0505d18f,f2dc9993ea4dd9d01d2aa3cfc84ce3e8f25672f6..cf11aeb45782605b9b8c493d63008c8b6e88158b
@@@ -1,15 -1,11 +1,25 @@@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
 +#include <atalk/compat.h>
 +
 +#ifndef HAVE_STRNLEN
 +size_t strnlen(const char *s, size_t max)
 +{
 +    size_t len;
 +  
 +    for (len = 0; len < max; len++) {
 +        if (s[len] == '\0') {
 +            break;
 +        }
 +    }
 +    return len;  
++
+ #if !defined HAVE_DIRFD && defined SOLARIS
+ #include <dirent.h>
+ int dirfd(DIR *dir)
+ {
+     return dir->dd_fd;
  }
  #endif
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 6a32499079c6c5d58fed13632bbf9b14f354cf20,0000000000000000000000000000000000000000..81788fe4bf16855d78705fcfcf85352618dfba50
mode 100644,000000..100644
--- /dev/null
@@@ -1,788 -1,0 +1,789 @@@
-                       if test x"netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
 +dnl Kitchen sink for configuration macros
 +
 +dnl Check for optional admin group support
 +AC_DEFUN([AC_NETATALK_ADMIN_GROUP], [
 +    netatalk_cv_admin_group=yes
 +    AC_MSG_CHECKING([for administrative group support])
 +    AC_ARG_ENABLE(admin-group,
 +          [  --disable-admin-group   disable admin group],[
 +            if test x"$enableval" = x"no"; then
 +                       AC_DEFINE(ADMIN_GRP, 0, [Define if the admin group should be enabled])
 +                       netatalk_cv_admin_group=no
 +                       AC_MSG_RESULT([no])
 +              else
 +                       AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled])
 +                       AC_MSG_RESULT([yes])
 +            fi],[
 +              AC_DEFINE(ADMIN_GRP, 1, [Define if the admin group should be enabled])
 +              AC_MSG_RESULT([yes])
 +      ])
 +])
 +
 +dnl Check for optional cracklib support
 +AC_DEFUN([AC_NETATALK_CRACKLIB], [
 +netatalk_cv_with_cracklib=no
 +AC_ARG_WITH(cracklib,
 +      [  --with-cracklib=DICT    enable/set location of cracklib dictionary],[
 +      if test "x$withval" != "xno" ; then
 +              cracklib="$withval"
 +              AC_CHECK_LIB(crack, main, [
 +                      AC_DEFINE(USE_CRACKLIB, 1, [Define if cracklib should be used])
 +                      LIBS="$LIBS -lcrack"
 +                      if test "$cracklib" = "yes"; then
 +                              cracklib="/usr/$atalk_libname/cracklib_dict"
 +                      fi
 +                      AC_DEFINE_UNQUOTED(_PATH_CRACKLIB, "$cracklib",
 +                              [path to cracklib dictionary])
 +                      AC_MSG_RESULT([setting cracklib dictionary to $cracklib])
 +                      netatalk_cv_with_cracklib=yes
 +                      ],[
 +                      AC_MSG_ERROR([cracklib not found!])
 +                      ]
 +              )
 +      fi
 +      ]
 +)
 +AC_MSG_CHECKING([for cracklib support])
 +AC_MSG_RESULT([$netatalk_cv_with_cracklib])
 +])
 +
 +dnl Check whether to enable debug code
 +AC_DEFUN([AC_NETATALK_DEBUG], [
 +AC_MSG_CHECKING([whether to enable verbose debug code])
 +AC_ARG_ENABLE(debug,
 +      [  --enable-debug          enable verbose debug code],[
 +      if test "$enableval" != "no"; then
 +              if test "$enableval" = "yes"; then
 +                      AC_DEFINE(DEBUG, 1, [Define if verbose debugging information should be included])
 +              else
 +                      AC_DEFINE_UNQUOTED(DEBUG, $enableval, [Define if verbose debugging information should be included])
 +              fi 
 +              AC_MSG_RESULT([yes])
 +      else
 +              AC_MSG_RESULT([no])
 +        AC_DEFINE(NDEBUG, 1, [Disable assertions])
 +      fi
 +      ],[
 +              AC_MSG_RESULT([no])
 +        AC_DEFINE(NDEBUG, 1, [Disable assertions])
 +      ]
 +)
 +])
 +
 +dnl Check whethe to disable tickle SIGALARM stuff, which eases debugging
 +AC_DEFUN([AC_NETATALK_DEBUGGING], [
 +AC_MSG_CHECKING([whether to enable debugging with debuggers])
 +AC_ARG_ENABLE(debugging,
 +      [  --enable-debugging      disable SIGALRM timers and DSI tickles (eg for debugging with gdb/dbx/...)],[
 +      if test "$enableval" != "no"; then
 +              if test "$enableval" = "yes"; then
 +                      AC_DEFINE(DEBUGGING, 1, [Define if you want to disable SIGALRM timers and DSI tickles])
 +              else
 +                      AC_DEFINE_UNQUOTED(DEBUGGING, $enableval, [Define if you want to disable SIGALRM timers and DSI tickles])
 +              fi 
 +              AC_MSG_RESULT([yes])
 +      else
 +              AC_MSG_RESULT([no])
 +      fi
 +      ],[
 +              AC_MSG_RESULT([no])
 +      ]
 +)
 +
 +])
 +
 +dnl Check for optional shadow password support
 +AC_DEFUN([AC_NETATALK_SHADOW], [
 +netatalk_cv_use_shadowpw=no
 +AC_ARG_WITH(shadow,
 +      [  --with-shadow           enable shadow password support [[auto]]],
 +      [netatalk_cv_use_shadowpw="$withval"],
 +      [netatalk_cv_use_shadowpw=auto]
 +)
 +
 +if test "x$netatalk_cv_use_shadowpw" != "xno"; then
 +    AC_CHECK_HEADER([shadow.h])
 +    if test x"$ac_cv_header_shadow_h" = x"yes"; then
 +      netatalk_cv_use_shadowpw=yes
 +      AC_DEFINE(SHADOWPW, 1, [Define if shadow passwords should be used])
 +    else 
 +      if test "x$shadowpw" = "xyes"; then
 +        AC_MSG_ERROR([shadow support not available])
 +      else
 +              netatalk_cv_use_shadowpw=no
 +      fi
 +    fi 
 +fi
 +
 +AC_MSG_CHECKING([whether shadow support should be enabled])
 +if test "x$netatalk_cv_use_shadowpw" = "xyes"; then
 +      AC_MSG_RESULT([yes])
 +else
 +      AC_MSG_RESULT([no])
 +fi
 +])
 +
 +dnl Check for optional valid-shell-check support
 +AC_DEFUN([AC_NETATALK_SHELL_CHECK], [
 +netatalk_cv_use_shellcheck=yes
 +AC_MSG_CHECKING([whether checking for a valid shell should be enabled])
 +AC_ARG_ENABLE(shell-check,
 +      [  --disable-shell-check   disable checking for a valid shell],[
 +      if test "$enableval" = "no"; then 
 +              AC_DEFINE(DISABLE_SHELLCHECK, 1, [Define if shell check should be disabled])
 +              AC_MSG_RESULT([no])
 +              netatalk_cv_use_shellcheck=no
 +      else
 +              AC_MSG_RESULT([yes])
 +      fi
 +      ],[
 +              AC_MSG_RESULT([yes])
 +      ]
 +)
 +])
 +
 +dnl Check for optional sysv initscript install
 +AC_DEFUN([AC_NETATALK_SYSV_STYLE], [
 +    AC_ARG_WITH(sysv-style,
 +                [  --with-sysv-style       use OS specific sysv config [[redhat|suse|gentoo|netbsd|debian]]],
 +                sysv_style="$withval", sysv_style=none
 +    )
 +    case "$sysv_style" in 
 +    "redhat")
 +          AC_MSG_RESULT([enabling redhat-style sysv support])
 +        ;;
 +    "suse")
 +          AC_MSG_RESULT([enabling suse-style sysv support])
 +        ;;
 +    "gentoo")
 +          AC_MSG_RESULT([enabling gentoo-style sysv support])
 +        ;;
 +    "netbsd")
 +          AC_MSG_RESULT([enabling netbsd-style sysv support])
 +        ;;
 +    "debian")
 +          AC_MSG_RESULT([enabling debian-style sysv support])
 +        ;;
 +    *)
 +          AC_MSG_RESULT([disabling sysv support])
 +        ;;
 +    esac
 +])
 +
 +dnl OS specific configuration
 +AC_DEFUN([AC_NETATALK_OS_SPECIFIC], [
 +case "$host_os" in
 +      *aix*)                          this_os=aix ;;
 +      *freebsd*)                      this_os=freebsd ;;
 +      *hpux11*)                       this_os=hpux11 ;;
 +      *irix*)                         this_os=irix ;;
 +      *linux*)                        this_os=linux ;;
 +      *osx*)                          this_os=macosx ;;
 +      *darwin*)                       this_os=macosx ;;
 +      *netbsd*)                       this_os=netbsd ;;
 +      *openbsd*)                      this_os=openbsd ;;
 +      *osf*)                          this_os=tru64 ;;
 +      *solaris*)                      this_os=solaris ;;
 +esac
 +
 +case "$host_cpu" in
 +      i386|i486|i586|i686|k7)         this_cpu=x86 ;;
 +      alpha)                                          this_cpu=alpha ;;
 +      mips)                                           this_cpu=mips ;;
 +      powerpc|ppc)                            this_cpu=ppc ;;
 +esac
 +
 +dnl --------------------- operating system specific flags (port from sys/*)
 +
 +dnl ----- FreeBSD specific -----
 +if test x"$this_os" = "xfreebsd"; then 
 +      AC_MSG_RESULT([ * FreeBSD specific configuration])
 +      AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
 +      AC_DEFINE(FREEBSD, 1, [Define if OS is FreeBSD])
 +      AC_DEFINE(SENDFILE_FLAVOR_BSD, 1, [Define if the sendfile() function uses BSD semantics])
 +    AC_DEFINE(OPEN_NOFOLLOW_ERRNO, EMLINK, errno returned by open with O_NOFOLLOW)
 +fi
 +
 +dnl ----- Linux specific -----
 +if test x"$this_os" = "xlinux"; then 
 +      AC_MSG_RESULT([ * Linux specific configuration])
 +      
 +      dnl ----- check if we need the quotactl wrapper
 +    AC_CHECK_HEADERS(linux/dqblk_xfs.h,,
 +              [AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h)
 +              AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h)]
 +      )
 +
 +
 +      dnl ----- as far as I can tell, dbtob always does the wrong thing
 +      dnl ----- on every single version of linux I've ever played with.
 +      dnl ----- see etc/afpd/quota.c
 +      AC_DEFINE(HAVE_BROKEN_DBTOB, 1, [Define if dbtob is broken])
 +
 +      netatalk_cv_linux_sendfile=yes
 +      AC_MSG_CHECKING([use sendfile syscall])
 +        AC_ARG_ENABLE(sendfile,
 +          [  --disable-sendfile       disable linux sendfile syscall],[
 +              if test x"$enableval" = x"no"; then
 +                      netatalk_cv_linux_sendfile=no
 +                      AC_MSG_RESULT([no])
 +              else
 +                      AC_MSG_RESULT([yes])
 +
 +              fi
 +          ],[
 +              AC_MSG_RESULT([yes])
 +      ]
 +
 +       )
 +
 +      if test x"$netatalk_cv_linux_sendfile" = "xyes"; then 
 +          AC_CACHE_CHECK([for linux sendfile support],netatalk_cv_HAVE_SENDFILE,[
 +          AC_TRY_LINK([#include <sys/sendfile.h>],
 +[\
 +int tofd, fromfd;
 +off_t offset;
 +size_t total;
 +ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
 +],
 +netatalk_cv_HAVE_SENDFILE=yes,netatalk_cv_HAVE_SENDFILE=no)])
 +
 +# Try and cope with broken Linux sendfile....
 +          AC_CACHE_CHECK([for broken linux sendfile support],netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE,[
 +          AC_TRY_LINK([\
 +#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
 +#undef _FILE_OFFSET_BITS
 +#endif
 +#include <sys/sendfile.h>],
 +[\
 +int tofd, fromfd;
 +off_t offset;
 +size_t total;
 +ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
 +],
 +netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE=yes,netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE=no,netatalk_cv_HAVE_BROKEN_SENDFILE=cross)])
 +
 +          if test x"$netatalk_cv_HAVE_SENDFILE" = x"yes"; then
 +              AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
 +              AC_DEFINE(SENDFILE_FLAVOR_LINUX,1,[Whether linux sendfile() API is available])
 +              AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used])
 +          elif test x"$netatalk_cv_HAVE_BROKEN_LINUX_SENDFILE" = x"yes"; then
 +              AC_DEFINE(SENDFILE_FLAVOR_LINUX,1,[Whether linux sendfile() API is available])
 +              AC_DEFINE(LINUX_BROKEN_SENDFILE_API,1,[Whether (linux) sendfile() is broken])
 +              AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile should be used])
 +          else
 +              netatalk_cv_linux_sendfile=no
 +              AC_MSG_RESULT(no);
 +          fi
 +      fi
 +
 +      need_dash_r=no
 +fi
 +
 +dnl ----- Mac OSX specific -----
 +if test x"$this_os" = "xmacosx"; then 
 +      AC_MSG_RESULT([ * Mac OSX specific configuration])
 +      AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
 +      AC_DEFINE(HAVE_2ARG_DBTOB, 1, [Define if dbtob takes two arguments])
 +      dnl AC_DEFINE(NO_DLFCN_H)
 +      AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if Quota support should be disabled])
 +      AC_DEFINE(MACOSX_SERVER, 1, [Define if compiling for MacOS X Server])
++    AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
 +fi
 +
 +dnl ----- NetBSD specific -----
 +if test x"$this_os" = "xnetbsd"; then 
 +      AC_MSG_RESULT([ * NetBSD specific configuration])
 +      AC_DEFINE(BSD4_4, 1, [BSD compatiblity macro])
 +      AC_DEFINE(NETBSD, 1, [Define if OS is NetBSD])
 +    AC_DEFINE(OPEN_NOFOLLOW_ERRNO, EFTYPE, errno returned by open with O_NOFOLLOW)
 +
 +      CFLAGS="-I\$(top_srcdir)/sys/netbsd $CFLAGS"
 +      need_dash_r=yes 
 +
 +      dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
 +      AC_DEFINE(UAM_DHX, 1, [Define if the DHX UAM modules should be compiled])
 +fi
 +
 +dnl ----- OpenBSD specific -----
 +if test x"$this_os" = "xopenbsd"; then 
 +      AC_MSG_RESULT([ * OpenBSD specific configuration])
 +      dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
 +      AC_DEFINE(UAM_DHX, 1, [Define if the DHX UAM modules should be compiled])
 +fi
 +
 +dnl ----- Solaris specific -----
 +if test x"$this_os" = "xsolaris"; then 
 +      AC_MSG_RESULT([ * Solaris specific configuration])
 +      AC_DEFINE(__svr4__, 1, [Solaris compatibility macro])
 +      AC_DEFINE(_ISOC9X_SOURCE, 1, [Compatibility macro])
 +      AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available])
 +      AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro])
 +      CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
 +      need_dash_r=yes
 +      sysv_style=solaris
 +
 +      solaris_module=no
 +      AC_MSG_CHECKING([if we can build Solaris kernel module])
 +      if test -x /usr/ccs/bin/ld && test x"$netatalk_cv_ddp_enabled" = x"yes" ; then
 +              solaris_module=yes
 +      fi
 +      AC_MSG_RESULT([$solaris_module])
 +
 +      COMPILE_64BIT_KMODULE=no
 +      KCFLAGS=""
 +      KLDFLAGS=""
 +      COMPILE_KERNEL_GCC=no
 +
 +      if test "$solaris_module" = "yes"; then
 +         dnl Solaris kernel module stuff
 +           AC_MSG_CHECKING([if we have to build a 64bit kernel module])
 +
 +         # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)       
 +         if test -x /usr/bin/isainfo; then
 +              # check for 64 bit platform
 +              if isainfo -kv | grep '^64-bit'; then
 +                      COMPILE_64BIT_KMODULE=yes
 +              fi
 +         fi
 +
 +         AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
 +
 +         if test "${GCC}" = yes; then
 +              COMPILE_KERNEL_GCC=yes
 +              if test "$COMPILE_64BIT_KMODULE" = yes; then
 +              
 +                        AC_MSG_CHECKING([if we can build a 64bit kernel module])
 +                      
 +                        case `$CC --version 2>/dev/null` in
 +                      [[12]].* | 3.0.*)
 +                              COMPILE_64BIT_KMODULE=no
 +                              COMPILE_KERNEL_GCC=no   
 +                              solaris_module=no;;
 +                      *)
 +                              # use for 64 bit
 +                              KCFLAGS="-m64"
 +                              #KLDFLAGS="-melf64_sparc"
 +                              KLDFLAGS="-64";;
 +                      esac    
 +                      
 +                      AC_MSG_RESULT([$COMPILE_64BIT_KMODULE])
 +                      
 +              else
 +                      KCFLAGS=""
 +                      KLDFLAGS=""
 +              fi
 +              KCFLAGS="$KCFLAGS -D_KERNEL -Wall -Wstrict-prototypes"
 +           else
 +              if test "$COMPILE_64BIT_KMODULE" = yes; then
 +                # use Sun CC (for a 64-bit kernel, uncomment " -xarch=v9 -xregs=no%appl ")
 +                      KCFLAGS="-xarch=v9 -xregs=no%appl"
 +                      KLDFLAGS="-64"
 +              else
 +                      KCFLAGS=""
 +                      KLDFLAGS=""
 +              fi
 +              KCFLAGS="-D_KERNEL $KCFLAGS -mno-app-regs -munaligned-doubles -fpcc-struct-return"
 +         fi
 +
 +           AC_CACHE_CHECK([for timeout_id_t],netatalk_cv_HAVE_TIMEOUT_ID_T,[
 +           AC_TRY_LINK([\
 +#include <sys/stream.h>
 +#include <sys/ddi.h>],
 +[\
 +timeout_id_t dummy;
 +],
 +netatalk_cv_HAVE_TIMEOUT_ID_T=yes,netatalk_cv_HAVE_TIMEOUT_ID_T=no,netatalk_cv_HAVE_TIMEOUT_ID_T=cross)])
 +
 +         AC_DEFINE(HAVE_TIMEOUT_ID_T, test x"$netatalk_cv_HAVE_TIMEOUT_ID" = x"yes", [define for timeout_id_t])
 +      fi
 +
 +      AC_SUBST(COMPILE_KERNEL_GCC)
 +      AC_SUBST(COMPILE_64BIT_KMODULE)
 +      AC_SUBST(KCFLAGS)
 +      AC_SUBST(KLDFLAGS)
 +fi
 +
 +])
 +
 +dnl Check for building PGP UAM module
 +AC_DEFUN([AC_NETATALK_PGP_UAM], [
 +AC_MSG_CHECKING([whether the PGP UAM should be build])
 +AC_ARG_ENABLE(pgp-uam,
 +      [  --enable-pgp-uam        enable build of PGP UAM module],[
 +      if test "$enableval" = "yes"; then 
 +              if test "x$neta_cv_have_openssl" = "xyes"; then 
 +                      AC_DEFINE(UAM_PGP, 1, [Define if the PGP UAM module should be compiled])
 +                      compile_pgp=yes
 +                      AC_MSG_RESULT([yes])
 +              else
 +                      AC_MSG_RESULT([no])
 +              fi
 +      fi
 +      ],[
 +              AC_MSG_RESULT([no])
 +      ]
 +)
 +])
 +
 +dnl Check for building Kerberos V UAM module
 +AC_DEFUN([AC_NETATALK_KRB5_UAM], [
 +netatalk_cv_build_krb5_uam=no
 +AC_ARG_ENABLE(krbV-uam,
 +      [  --enable-krbV-uam       enable build of Kerberos V UAM module],
 +      [
 +              if test x"$enableval" = x"yes"; then
 +                      NETATALK_GSSAPI_CHECK([
 +                              netatalk_cv_build_krb5_uam=yes
 +                      ],[
 +                              AC_MSG_ERROR([need GSSAPI to build Kerberos V UAM])
 +                      ])
 +              fi
 +      ]
 +      
 +)
 +
 +AC_MSG_CHECKING([whether Kerberos V UAM should be build])
 +if test x"$netatalk_cv_build_krb5_uam" = x"yes"; then
 +      AC_MSG_RESULT([yes])
 +else
 +      AC_MSG_RESULT([no])
 +fi
 +AM_CONDITIONAL(USE_GSSAPI, test x"$netatalk_cv_build_krb5_uam" = x"yes")
 +])
 +
 +dnl Check for overwrite the config files or not
 +AC_DEFUN([AC_NETATALK_OVERWRITE_CONFIG], [
 +AC_MSG_CHECKING([whether configuration files should be overwritten])
 +AC_ARG_ENABLE(overwrite,
 +      [  --enable-overwrite      overwrite configuration files during installation],
 +      [OVERWRITE_CONFIG="${enable_overwrite}"],
 +      [OVERWRITE_CONFIG="no"]
 +)
 +AC_MSG_RESULT([$OVERWRITE_CONFIG])
 +AC_SUBST(OVERWRITE_CONFIG)
 +])
 +
 +dnl Check for LDAP support, for client-side ACL visibility
 +AC_DEFUN([AC_NETATALK_LDAP], [
 +AC_MSG_CHECKING(for LDAP (necessary for client-side ACL visibility))
 +AC_ARG_WITH(ldap,
 +    [AS_HELP_STRING([--with-ldap],
 +        [LDAP support (default=auto)])],
 +    [ case "$withval" in
 +      yes|no)
 +          with_ldap="$withval"
 +                ;;
 +      *)
 +          with_ldap=auto
 +          ;;
 +      esac ])
 +AC_MSG_RESULT($with_ldap)
 +
 +if test x"$with_ldap" != x"no" ; then
 +      AC_CHECK_HEADER([ldap.h], with_ldap=yes,
 +        [ if test x"$with_ldap" = x"yes" ; then
 +            AC_MSG_ERROR([Missing LDAP headers])
 +        fi
 +              with_ldap=no
 +        ])
 +      AC_CHECK_LIB(ldap, ldap_init, with_ldap=yes,
 +        [ if test x"$with_ldap" = x"yes" ; then
 +            AC_MSG_ERROR([Missing LDAP library])
 +        fi
 +              with_ldap=no
 +        ])
 +fi
 +
 +if test x"$with_ldap" = x"yes"; then
 +      AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
 +fi
 +])
 +
 +dnl Check for ACL support
 +AC_DEFUN([AC_NETATALK_ACL], [
 +AC_MSG_CHECKING(whether to support ACLs)
 +AC_ARG_WITH(acls,
 +    [AS_HELP_STRING([--with-acls],
 +        [Include ACL support (default=auto)])],
 +    [ case "$withval" in
 +      yes|no)
 +          with_acl_support="$withval"
 +                ;;
 +      *)
 +          with_acl_support=auto
 +          ;;
 +      esac ],
 +    [with_acl_support=auto])
 +AC_MSG_RESULT($with_acl_support)
 +
 +if test x"$with_acl_support" = x"no"; then
 +      AC_MSG_RESULT(Disabling ACL support)
 +      AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
 +else
 +    with_acl_support=yes
 +fi
 +
 +if test x"$with_acl_support" = x"yes" ; then
 +      AC_MSG_NOTICE(checking whether ACL support is available:)
 +      case "$host_os" in
 +      *sysv5*)
 +              AC_MSG_NOTICE(Using UnixWare ACLs)
 +              AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
 +              ;;
 +      *solaris*)
 +              AC_MSG_NOTICE(Using solaris ACLs)
 +              AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
 +              ACL_LIBS="$ACL_LIBS -lsec"
 +              ;;
 +      *hpux*)
 +              AC_MSG_NOTICE(Using HPUX ACLs)
 +              AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
 +              ;;
 +      *irix*)
 +              AC_MSG_NOTICE(Using IRIX ACLs)
 +              AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
 +              ;;
 +      *aix*)
 +              AC_MSG_NOTICE(Using AIX ACLs)
 +              AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
 +              ;;
 +      *osf*)
 +              AC_MSG_NOTICE(Using Tru64 ACLs)
 +              AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
 +              ACL_LIBS="$ACL_LIBS -lpacl"
 +              ;;
 +      *darwin*)
 +              AC_MSG_NOTICE(ACLs on Darwin currently not supported)
 +              AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
 +              ;;
 +      *)
 +              AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
 +              case "$host_os" in
 +              *linux*)
 +                      AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
 +                      ;;
 +              esac
 +              AC_CACHE_CHECK([for POSIX ACL support],netatalk_cv_HAVE_POSIX_ACLS,[
 +                      acl_LIBS=$LIBS
 +                      LIBS="$LIBS $ACL_LIBS"
 +                      AC_TRY_LINK([
 +                              #include <sys/types.h>
 +                              #include <sys/acl.h>
 +                      ],[
 +                              acl_t acl;
 +                              int entry_id;
 +                              acl_entry_t *entry_p;
 +                              return acl_get_entry(acl, entry_id, entry_p);
 +                      ],
 +                      [netatalk_cv_HAVE_POSIX_ACLS=yes],
 +                      [netatalk_cv_HAVE_POSIX_ACLS=no
 +                with_acl_support=no])
 +                      LIBS=$acl_LIBS
 +              ])
 +              if test x"$netatalk_cv_HAVE_POSIX_ACLS" = x"yes"; then
 +                      AC_MSG_NOTICE(Using POSIX ACLs)
 +                      AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
 +                      AC_CACHE_CHECK([for acl_get_perm_np],netatalk_cv_HAVE_ACL_GET_PERM_NP,[
 +                              acl_LIBS=$LIBS
 +                              LIBS="$LIBS $ACL_LIBS"
 +                              AC_TRY_LINK([
 +                                      #include <sys/types.h>
 +                                      #include <sys/acl.h>
 +                              ],[
 +                                      acl_permset_t permset_d;
 +                                      acl_perm_t perm;
 +                                      return acl_get_perm_np(permset_d, perm);
 +                              ],
 +                              [netatalk_cv_HAVE_ACL_GET_PERM_NP=yes],
 +                              [netatalk_cv_HAVE_ACL_GET_PERM_NP=no])
 +                              LIBS=$acl_LIBS
 +                      ])
++                      if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
 +                              AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
 +                      fi
 +
 +
 +                       AC_CACHE_CHECK([for acl_from_mode], netatalk_cv_HAVE_ACL_FROM_MODE,[
 +                               acl_LIBS=$LIBS
 +                               LIBS="$LIBS $ACL_LIBS"
 +                AC_CHECK_FUNCS(acl_from_mode,
 +                               [netatalk_cv_HAVE_ACL_FROM_MODE=yes],
 +                               [netatalk_cv_HAVE_ACL_FROM_MODE=no])
 +                               LIBS=$acl_LIBS
 +                       ])
 +                       if test x"netatalk_cv_HAVE_ACL_FROM_MODE" = x"yes"; then
 +                               AC_DEFINE(HAVE_ACL_FROM_MODE,1,[Whether acl_from_mode() is available])
 +                       fi
 +
 +              else
 +                      AC_MSG_NOTICE(ACL support is not avaliable)
 +                      AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
 +              fi
 +              ;;
 +    esac
 +fi
 +
 +if test x"$with_acl_support" = x"yes" ; then
 +   AC_CHECK_HEADERS([acl/libacl.h])
 +    AC_DEFINE(HAVE_ACLS,1,[Whether ACLs support is available])
 +    AC_SUBST(ACL_LIBS)
 +fi
 +])
 +
 +dnl Check for Extended Attributes support
 +AC_DEFUN([AC_NETATALK_EXTENDED_ATTRIBUTES], [
 +neta_cv_eas="ad"
 +neta_cv_eas_sys_found=no
 +neta_cv_eas_sys_not_found=no
 +
 +AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h sys/ea.h)
 +
 +case "$this_os" in
 +
 +  *osf*)
 +      AC_SEARCH_LIBS(getproplist, [proplist])
 +      AC_CHECK_FUNCS([getproplist fgetproplist setproplist fsetproplist],
 +                   [neta_cv_eas_sys_found=yes],
 +                   [neta_cv_eas_sys_not_found=yes])
 +      AC_CHECK_FUNCS([delproplist fdelproplist add_proplist_entry get_proplist_entry],,
 +                   [neta_cv_eas_sys_not_found=yes])
 +      AC_CHECK_FUNCS([sizeof_proplist_entry],,
 +                   [neta_cv_eas_sys_not_found=yes])
 +  ;;
 +
 +  *solaris*)
 +      AC_CHECK_FUNCS([attropen],
 +                   [neta_cv_eas_sys_found=yes],
 +                   [neta_cv_eas_sys_not_found=yes])
 +  ;;
 +
 +  'freebsd')
 +    AC_CHECK_FUNCS([extattr_delete_fd extattr_delete_file extattr_delete_link],
 +                   [neta_cv_eas_sys_found=yes],
 +                   [neta_cv_eas_sys_not_found=yes])
 +    AC_CHECK_FUNCS([extattr_get_fd extattr_get_file extattr_get_link],,
 +                   [neta_cv_eas_sys_not_found=yes])
 +    AC_CHECK_FUNCS([extattr_list_fd extattr_list_file extattr_list_link],,
 +                   [neta_cv_eas_sys_not_found=yes])
 +    AC_CHECK_FUNCS([extattr_set_fd extattr_set_file extattr_set_link],,
 +                   [neta_cv_eas_sys_not_found=yes])
 +  ;;
 +
 +  *freebsd4* | *dragonfly* )
 +    AC_DEFINE(BROKEN_EXTATTR, 1, [Does extattr API work])
 +  ;;
 +
 +  *)
 +      AC_SEARCH_LIBS(getxattr, [attr])
 +
 +    if test "x$neta_cv_eas_sys_found" != "xyes" ; then
 +       AC_CHECK_FUNCS([getxattr lgetxattr fgetxattr listxattr llistxattr],
 +                      [neta_cv_eas_sys_found=yes],
 +                      [neta_cv_eas_sys_not_found=yes])
 +         AC_CHECK_FUNCS([flistxattr removexattr lremovexattr fremovexattr],,
 +                      [neta_cv_eas_sys_not_found=yes])
 +         AC_CHECK_FUNCS([setxattr lsetxattr fsetxattr],,
 +                      [neta_cv_eas_sys_not_found=yes])
 +    fi
 +
 +    if test "x$neta_cv_eas_sys_found" != "xyes" ; then
 +         AC_CHECK_FUNCS([getea fgetea lgetea listea flistea llistea],
 +                      [neta_cv_eas_sys_found=yes],
 +                      [neta_cv_eas_sys_not_found=yes])
 +         AC_CHECK_FUNCS([removeea fremoveea lremoveea setea fsetea lsetea],,
 +                      [neta_cv_eas_sys_not_found=yes])
 +    fi
 +
 +    if test "x$neta_cv_eas_sys_found" != "xyes" ; then
 +         AC_CHECK_FUNCS([attr_get attr_list attr_set attr_remove],,
 +                      [neta_cv_eas_sys_not_found=yes])
 +       AC_CHECK_FUNCS([attr_getf attr_listf attr_setf attr_removef],,
 +                      [neta_cv_eas_sys_not_found=yes])
 +    fi
 +  ;;
 +esac
 +
 +# Do xattr functions take additional options like on Darwin?
 +if test x"$ac_cv_func_getxattr" = x"yes" ; then
 +      AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt, [
 +              old_LIBS=$LIBS
 +              LIBS="$LIBS $ACL_LIBS"
 +              AC_TRY_COMPILE([
 +                      #include <sys/types.h>
 +                      #if HAVE_ATTR_XATTR_H
 +                      #include <attr/xattr.h>
 +                      #elif HAVE_SYS_XATTR_H
 +                      #include <sys/xattr.h>
 +                      #endif
 +              ],[
 +                      getxattr(0, 0, 0, 0, 0, 0);
 +              ],
 +              [smb_attr_cv_xattr_add_opt=yes],
 +              [smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS])
 +      ])
 +      if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
 +              AC_DEFINE(XATTR_ADD_OPT, 1, [xattr functions have additional options])
 +      fi
 +fi
 +
 +if test "x$neta_cv_eas_sys_found" = "xyes" ; then
 +   if test "x$neta_cv_eas_sys_not_found" != "xyes" ; then
 +      neta_cv_eas="$neta_cv_eas | sys"
 +   fi
 +fi
 +AC_DEFINE_UNQUOTED(EA_MODULES,["$neta_cv_eas"],[Available Extended Attributes modules])
 +])
 +
 +dnl Check for libsmbsharemodes from Samba for Samba/Netatalk access/deny/share modes interop
 +dnl Defines "neta_cv_have_smbshmd" to "yes" or "no"
 +dnl AC_SUBST's "SMB_SHAREMODES_CFLAGS" and "SMB_SHAREMODES_LDFLAGS"
 +dnl AM_CONDITIONAL's "USE_SMB_SHAREMODES"
 +AC_DEFUN([AC_NETATALK_SMB_SHAREMODES], [
 +    neta_cv_have_smbshmd=no
 +    AC_ARG_WITH(smbsharemodes-lib,
 +                [  --with-smbsharemodes-lib=PATH        PATH to libsmbsharemodes lib from Samba],
 +                [SMB_SHAREMODES_LDFLAGS="-L$withval -lsmbsharemodes"]
 +    )
 +    AC_ARG_WITH(smbsharemodes-include,
 +                [  --with-smbsharemodes-include=PATH    PATH to libsmbsharemodes header from Samba],
 +                [SMB_SHAREMODES_CFLAGS="-I$withval"]
 +    )
 +    AC_ARG_WITH(smbsharemodes,
 +                [AS_HELP_STRING([--with-smbsharemodes],[Samba interop (default is yes)])],
 +                [use_smbsharemodes=$withval],
 +                [use_smbsharemodes=yes]
 +    )
 +
 +    if test x"$use_smbsharemodes" = x"yes" ; then
 +        AC_MSG_CHECKING([whether to enable Samba/Netatalk access/deny/share-modes interop])
 +
 +        saved_CFLAGS="$CFLAGS"
 +        saved_LDFLAGS="$LDFLAGS"
 +        CFLAGS="$SMB_SHAREMODES_CFLAGS $CFLAGS"
 +        LDFLAGS="$SMB_SHAREMODES_LDFLAGS $LDFLAGS"
 +
 +        AC_LINK_IFELSE(
 +            [#include <unistd.h>
 +             #include <stdio.h>
 +             #include <sys/time.h>
 +             #include <time.h>
 +             #include <stdint.h>
 +             /* From messages.h */
 +             struct server_id {
 +                 pid_t pid;
 +             };
 +             #include "smb_share_modes.h"
 +             int main(void) { (void)smb_share_mode_db_open(""); return 0;}],
 +            [neta_cv_have_smbshmd=yes]
 +        )
 +
 +        AC_MSG_RESULT($neta_cv_have_smbshmd)
 +        AC_SUBST(SMB_SHAREMODES_CFLAGS, [$SMB_SHAREMODES_CFLAGS])
 +        AC_SUBST(SMB_SHAREMODES_LDFLAGS, [$SMB_SHAREMODES_LDFLAGS])
 +        CFLAGS="$saved_CFLAGS"
 +        LDFLAGS="$saved_LDFLAGS"
 +    fi
 +
 +    AM_CONDITIONAL(USE_SMB_SHAREMODES, test x"$neta_cv_have_smbshmd" = x"yes")
 +])
Simple merge