Merge branch-2-1

diff --cc NEWS
Simple merge

diff --cc etc/afpd/acl_mappings.h
Simple merge

diff --cc etc/cnid_dbd/cnid_metad.c
index 66108c013b3532b9b303935feb69f3f9547167a5,3ce9151c9a4f94eff9be641b2fe9264c08fec657..23a6fd0266334e05e9dbb7f9e396890780cade9a
--- 1/etc/cnid_dbd/cnid_metad.c
--- 2/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@@ -597,7 -604,9 +597,8 @@@ int main(int argc, char *argv[]
          if (rqstfd <= 0)
              continue;
  
-         ret = readt(rqstfd, &len, sizeof(int), 4);
 -        /* TODO: Check out read errors, broken pipe etc. in libatalk. Is
 -           SIGIPE ignored there? Answer: Ignored for dsi, but not for asp ... */
 -        ret = readt(rqstfd, &len, sizeof(int), 1, 5);
++        ret = readt(rqstfd, &len, sizeof(int), 1, 4);
++
          if (!ret) {
              /* already close */
              goto loop_end;

diff --cc etc/cnid_dbd/comm.c
index 8038f2668f7795479e2472919f6673c60f14173e,284ecae4c2fcb7f4f2664253c957de689eca5461..89355d767b8c0072a01d42763a935850b03e5a9c
--- 1/etc/cnid_dbd/comm.c
--- 2/etc/cnid_dbd/comm.c
+++ b/etc/cnid_dbd/comm.c
@@@ -246,16 -264,8 +246,16 @@@ int comm_rcv(struct cnid_dbd_rqst *rqst
  
      if (!cur_fd)
          return 0;
 +
 +    LOG(log_maxdebug, logtype_cnid, "comm_rcv: got data on fd %u", cur_fd);
 +
 +    if (setnonblock(cur_fd, 1) != 0) {
 +        LOG(log_error, logtype_cnid, "comm_rcv: setnonblock: %s", strerror(errno));
 +        return -1;
 +    }
 +
      nametmp = rqst->name;
-     if ((b = readt(cur_fd, rqst, sizeof(struct cnid_dbd_rqst), CNID_DBD_TIMEOUT))
 -    if ((b = readt(cur_fd, rqst, sizeof(struct cnid_dbd_rqst), 1, 5))
++    if ((b = readt(cur_fd, rqst, sizeof(struct cnid_dbd_rqst), 1, CNID_DBD_TIMEOUT))
          != sizeof(struct cnid_dbd_rqst)) {
          if (b)
              LOG(log_error, logtype_cnid, "error reading message header: %s", strerror(errno));
@@@ -264,8 -274,7 +264,8 @@@
          return 0;
      }
      rqst->name = nametmp;
-     if (rqst->namelen && readt(cur_fd, rqst->name, rqst->namelen, CNID_DBD_TIMEOUT)
 -    if (rqst->namelen && readt(cur_fd, rqst->name, rqst->namelen, 1, 5) != rqst->namelen) {
++    if (rqst->namelen && readt(cur_fd, rqst->name, rqst->namelen, 1, CNID_DBD_TIMEOUT)
 +        != rqst->namelen) {
          LOG(log_error, logtype_cnid, "error reading message name: %s", strerror(errno));
          invalidate_fd(cur_fd);
          return 0;

diff --cc etc/cnid_dbd/usockfd.c
Simple merge

diff --cc include/atalk/util.h
Simple merge

diff --cc libatalk/cnid/dbd/cnid_dbd.c
Simple merge

diff --cc libatalk/util/socket.c
Simple merge