@@ -1,3 +1,8 @@

+Fri Mar  6 17:19:53 EET 2009 (edwin)

+------------------------------------

+ * clamd/others.c, unit_tests/check_clamd.c: fix FILDES and make

+ check on NetBSD. (bb #1411).

+

 Fri Mar  6 14:21:52 EET 2009 (edwin)

 ------------------------------------

  * clamd/others.c, clamd/server-th.c: wake recvloopth after SelfCheck

@@ -290,7 +290,7 @@ static int read_fd_data(struct fd_buf *buf)

       msg.msg_iov = iov;

       msg.msg_iovlen = 1;

       msg.msg_control = b.buff;

-      msg.msg_controllen = CMSG_LEN(sizeof(int));

+      msg.msg_controllen = sizeof(b.buff);

       n = recvmsg(buf->fd, &msg, 0);

       if (n < 0)

@@ -114,7 +114,12 @@ static void conn_teardown(void)

 #define UNKNOWN_REPLY "UNKNOWN COMMAND"

 #define NONEXISTENT "/nonexistent\vfilename"

+

+#ifdef HAVE_STRERROR_R

 #define NONEXISTENT_REPLY NONEXISTENT": lstat() failed: No such file or directory. ERROR"

+#else

+#define NONEXISTENT_REPLY NONEXISTENT": lstat() failed: 2. ERROR"

+#endif

 #define ACCDENIED BUILDDIR"/accdenied"

 #define ACCDENIED_REPLY ACCDENIED": Access denied. ERROR"