Merge 2-1

diff --cc NEWS
index 60f20151ff2f87c8b268bc9e199a7625b34960c4,bc54188ee6ad0a9029cac4aa3f48090349b9f7b9..5d928fdace9e89ef7312c346a5aa5f5d982b3edc
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,63 -1,8 +1,68 @@@
 +Changes in 2.2alpha6? or 2.2beta1?
 +====================
 +
 +* FIX: composition of Surrogate Pair
 +
 +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
+ ================
+ 
+ * FIX: afpd: Fix for LDAP user cache corruption
+ 
  Changes in 2.1.5
  ================
  

diff --cc libatalk/acl/cache.c
Simple merge