Merge remote branch 'origin/master' into branch-allea

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

diff --cc etc/cnid_dbd/usockfd.c
index ff1538b340c334c2428457455c8e3cf2bfda9f21,0b119209cf987929f3e268f441584a5d95619d6e..c2e625f6d3b1813862496c32bfcece9303ee5de9
--- 1/etc/cnid_dbd/usockfd.c
--- 2/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@@ -17,10 -19,17 +17,11 @@@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <netdb.h>
 -
 -#ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
 -#endif /* HAVE_SYS_TYPES_H */
 -#ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
 -#endif /* HAVE_SYS_TIME_H */
 -
  
  #include <atalk/logger.h>
+ #include <atalk/compat.h>
  #include "usockfd.h"
  
  #include <sys/select.h>