Merge branch-2-1

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index 4b2873c504d4aeb1a9636afe69f3f1177f75273d..5abf8490efad54b2c1e16fae6073bc41bfda0e08 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,11 @@ Changes in 2.1.5
 * UPD: afpd: support newlines in -loginmesg with \n escaping syntax
 * UPD: afpd: support for changed chmod semantics on ZFS with ACLs
        in onnv145+
-* FIX: afpd: fix leaking resource when moving objects on the server
+* FIX: afpd: fix leaking ressource when moving objects on the server
+* FIX: afpd: backport Solaris 10 compatibilty fix from 2.2: don't use
+       SO_SNDTIMEO/SO_RCVTIMEO, use non-blocking IO and select instead.
+* FIX: cnid_dbd: backport Solaris 10 compatibilty fix from 2.2: don't
+       use SO_SNDTIMEO/SO_RCVTIMEO, use non-blocking IO and select instead.
 
 Changes in 2.1.4
 ================