Merge sf/master

diff --combined NEWS
index 2a54c2b9dad44dd8d957bd9093cf1c64142abda1,20c32f55c08998c28517ec1ee9963e59d5db96be..d4df9e7a64f22c91b30243397ed4d3f099a98d86
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,24 -1,5 +1,24 @@@
 +Changes in 2.2
 +==============
 +
 +* NEW: afpd: new volume option "nonetids"
 +* NEW: afpd: ACL access check caching
  * NEW: afpd: FCE event notifications
  * NEW: afpd: new option "-mimicmodel" for specifying Bonjour model registration
 +* UPD: Support for Berkeley DB 5.1
 +* UPD: case-conversion is based on Unicode 6.0.0
 +* UPD: cnid_metad: allow up to 4096 volumes
 +* UPD: afpd: only forward SIGTERM and SIGUSR1 from parent to childs
 +* UPD: afpd: use internal function instead of popening du -sh in order to
 +       calculate the used size of a volume for option "volsizelimit"
 +* UPD: afpd: Add negative UUID caching, enhance local UUID handling
 +* FIX: afpd: configuration reload with SIGHUP
 +* FIX: afpd: crashes in the dircache
 +* FIX: afpd: Correct afp logout vs dsi eof behaviour
 +* FIX: afpd: new catsearch was broken
 +* FIX: afpd: only use volume UUIDs in master afpd
 +* FIX: dbd: Multiple fixes, reliable locking
 +* FIX: ad file suite: fix an error that resulted in CNID database inconsistencies
  
  Changes in 2.2beta4
  ===================
@@@ -125,6 -106,7 +125,7 @@@ Changes in 2.1.
  * FIX: AppleDouble buffer overrun by extremely long filename
  * UPD: afpd: return version info with machine type in DSIGetStatus
  * UPD: dbd: use on-disk temporary rebuild db instead of in-memory db
+ * UPD: suse: initscript update
  
  Changes in 2.1.5
  ================

diff --combined configure.in
index bbdee98320a9a0b1916bfe568d01df45bf3e4cb0,a0726f2f44e55b86737b56ab21dba35a3a7bb8aa..28df29fdc6db1ad0e1965d237250479dae19a6f9
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -8,6 -8,7 +8,7 @@@ AC_SUBST(NETATALK_VERSION
  AC_CANONICAL_SYSTEM
  AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
  AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE([enable])
  
  dnl Checks for programs.
  AC_PROG_AWK
@@@ -1074,27 -1075,13 +1075,27 @@@ if test x"$with_acl_support" = x"yes" 
                                        acl_perm_t perm;
                                        return acl_get_perm_np(permset_d, perm);
                                ],
 -                              [samba_cv_HAVE_ACL_GET_PERM_NP=yes],
 -                              [samba_cv_HAVE_ACL_GET_PERM_NP=no])
 +                              [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])
@@@ -1104,7 -1091,6 +1105,7 @@@
  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