Merge branch 'branch-netatalk-2-1'

diff --combined NEWS
index ec4972322661e8e49bc1154dd6d387bbe0a3f186,a03e5dca48e295de1b72bb720aef380f130eca38..93184a09c74bf0efc76a9f4905a573e74a0483e8
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,65 -1,3 +1,65 @@@
 +Changes in 2.2beta1
 +====================
 +
 +* FIX: composition of Surrogate Pair
 +* UPD: gentoo,suse,cobalt,tru64: inistscript name is "netatalk", not "atalk"
 +* UPD: gentoo: rc-update install don't hook in the Makefile
 +
 +Changes in 2.2alpha5
 +====================
 +
 +* UPD: afpd: new option "searchdb" which enables fast catalog searches
 +       using the CNID db.
 +* UPD: Case-insensitive fast search with the CNID db
 +* UPD: cnid_dbd: afpd now passes the volume path, not the db path when
 +       connecting for a volume. cnid_dbd will read the
 +       ".AppleDesktop/.volinfo" file of the volume in order to figure
 +       out the CNID db path and the volume charset encoding.
 +
 +Changes in 2.2alpha4
 +====================
 +
 +* NEW: Enhanced CNID "dbd" database for fast name search support.
 +       Important: this makes cnidscheme "cdb" incompatible with "dbd".
 +* NEW: afpd: support for fast catalog searches
 +* NEW: ad utility: ad find
 +* UPD: afpd: CNID database versioning check for "cdb" scheme
 +* UPD: cnid_dbd: CNID database versioning and upgrading. Additional
 +       CNID database index for fast name searches.
 +
 +Changes in 2.2alpha3
 +====================
 +
 +* FIX: afpd: various fixes
 +* FIX: Any daemon did not run if atalkd doesn't exist (redhat/debian)
 +
 +Changes in 2.2alpha2
 +====================
 +
 +* FIX: afpd: fix compilation error when ACL support is not available
 +* FIX: Ensure Appletalk manpages and config files are distributed
 +
 +Changes in 2.2alpha1
 +====================
 +
 +* NEW: ad utility: ad cp
 +* NEW: ad utility: ad rm
 +* NEW: ad utility: ad mv
 +* NEW: afpd: dynamic directoy and CNID cache (new config option -dircachesize)
 +* NEW: afpd: POSIX 1e ACL support
 +* NEW: afpd: automagic Zeroconf registration with avahi, registering both
 +       the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
 +* UPD: afpd: ACLs usable (though not visible on the client side) without common
 +       directory service, by mapping ACLs to UARight
 +* UPD: afpd: performance improvements for ACL access calculations
 +* UPD: AppleTalk is disabled by default at configuration time. If needed
 +       use configure switch --enable-ddp.
 +* FIX: afpd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO/SO_RCVTIMEO,
 +       use non-blocking IO and select instead.
 +* FIX: cnid_dbd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO/SO_RCVTIMEO,
 +       use non-blocking IO and select instead.
 +* REM: afile/achfile/apple_cp/apple_mv/apple_rm: use ad
 +
  Changes in 2.1.6
  ================
  
@@@ -67,6 -5,7 +67,7 @@@
  * FIX: gentoo: cannot set $CNID_CONFIG
  * FIX: ubuntu: servername was empty
  * FIX: Solaris: configure script failed to enable DDP module
+ * FIX: AppleDouble buffer overrun by extremely long filename
  * UPD: afpd: return version info with machine type in DSIGetStatus
  
  Changes in 2.1.5
@@@ -91,7 -30,7 +92,7 @@@ Changes in 2.1.
  * FIX: afpd: Better handling of symlinks in combination with ACLs and EAs.
         Fixes bug 3074076.
  * FIX: dbd: Adding a file with the CNID from it's adouble file did
 -       not work in case that CNID was alread occupied in the database
 +       not work in case that CNID was already occupied in the database
  * FIX: macusers: add support for Solaris
  * NEW: cnid_metad: use a PID lockfile
  * NEW: afpd: prevent log flooding
@@@ -143,7 -82,6 +144,7 @@@ Changes in 2.1-releas
  
  Changes in 2.1-beta2
  ====================
 +
  * NEW: afpd: static generated AFP signature stored in afp_signature.conf,
         cf man 5 afp_signature.conf
  * NEW: afpd: clustering support: new per volume option "cnidserver".