@@ -1,3 +1,13 @@

+Fri May  9 23:11:51 EEST 2008 (edwin)

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

+  * build system: add configure checks for FD passing

+  * m4/fdpassing.m4: move all FD passing checks here

+  * clamd/session.[ch], scanner.[ch]:

+  * contrib/clamd_fdscan:

+	add rfc2292/bsd4.4 style file descriptor passing support

+	this code is from Marc Balmer <marc*msys.ch>, with some portability

+	fixes applied

+

 Fri May  9 14:46:57 EEST 2008 (edwin)

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

   * contrib/init/RedHat: check for already running clamav-milter (bb #823)

@@ -71,8 +71,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	config/ltmain.sh config/missing mkinstalldirs

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/configure.in

+	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

@@ -132,7 +132,7 @@ AC_LIB_PROG_LD_GNU

 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

-# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL

+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL

 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

@@ -7630,5 +7630,6 @@ AC_SUBST([am__untar])

 ]) # _AM_PROG_TAR

 m4_include([m4/acinclude.m4])

+m4_include([m4/fdpassing.m4])

 m4_include([m4/lib-link.m4])

 m4_include([m4/lib-prefix.m4])

@@ -84,6 +84,9 @@

 /* "build unrar code" */

 #undef ENABLE_UNRAR

+/* whether _XOPEN_SOURCE needs to be defined for fd passing to work */

+#undef FDPASS_NEED_XOPEN

+

 /* file i/o buffer size */

 #undef FILEBUFF

@@ -96,9 +99,6 @@

 /* use "Cache-Control: no-cache" in freshclam */

 #undef FRESHCLAM_NO_CACHE

-/* access rights in msghdr */

-#undef HAVE_ACCRIGHTS_IN_MSGHDR

-

 /* attrib aligned */

 #undef HAVE_ATTRIB_ALIGNED

@@ -129,6 +129,9 @@

 /* Define to 1 if you have the <dlfcn.h> header file. */

 #undef HAVE_DLFCN_H

+/* have working file descriptor passing support */

+#undef HAVE_FD_PASSING

+

 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */

 #undef HAVE_FSEEKO

@@ -306,9 +309,6 @@

 /* zlib installed */

 #undef HAVE_ZLIB_H

-/* Early Linux doesn't set cmsg fields */

-#undef INCOMPLETE_CMSG

-

 /* bzip funtions do not have bz2 prefix */

 #undef NOBZ2PREFIX

@@ -57,8 +57,8 @@ subdir = clamav-milter

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in INSTALL

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/configure.in

+	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 mkinstalldirs = $(install_sh) -d

@@ -56,8 +56,8 @@ subdir = clamconf

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/configure.in

+	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 mkinstalldirs = $(install_sh) -d

@@ -56,8 +56,8 @@ subdir = clamd

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/configure.in

+	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 mkinstalldirs = $(install_sh) -d

@@ -373,6 +373,45 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_engin

     return ret;

 }

+/*

+ * This function was readded by mbalmer@openbsd.org.  That is the reason

+ * why it is so nicely formatted.

+ */

+int scanfd(const int fd, unsigned long int *scanned,

+    const struct cl_engine *engine, const struct cl_limits *limits,

+    unsigned int options, const struct cfgstruct *copt, int odesc)  

+{

+	int ret;

+	const char *virname;

+	struct stat statbuf;

+	char fdstr[32];

+

+

+	if(fstat(fd, &statbuf) == -1)

+		return -1;

+

+	if(!S_ISREG(statbuf.st_mode))

+		return -1;

+

+	snprintf(fdstr, sizeof(fdstr), "fd[%d]", fd);

+

+	ret = cl_scandesc(fd, &virname, scanned, engine, limits, options);

+

+	if(ret == CL_VIRUS) {

+	mdprintf(odesc, "%s: %s FOUND\n", fdstr, virname);

+		logg("%s: %s FOUND\n", fdstr, virname);

+		virusaction(fdstr, virname, copt);

+	} else if(ret != CL_CLEAN) {

+		mdprintf(odesc, "%s: %s ERROR\n", fdstr, cl_strerror(ret));

+		logg("%s: %s ERROR\n", fdstr, cl_strerror(ret));

+	} else {

+		mdprintf(odesc, "%s: OK\n", fdstr);

+		if(logok)

+			logg("%s: OK\n", fdstr);

+	}

+	return ret;

+}

+

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt)

 {

 	int ret, sockfd, acceptd;

@@ -28,6 +28,8 @@

 int scan(const char *filename, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int odesc, unsigned int type);

+int scanfd(const int fd, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int odesc);

+

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt);

 #endif

@@ -24,6 +24,11 @@

 #include "clamav-config.h"

 #endif

+#if defined HAVE_FD_PASSING && defined FDPASS_NEED_XOPEN

+/* to expose BSD 4.4/Unix98 semantics instead of BSD 4.3 semantics */

+#define _XOPEN_SOURCE 500

+#endif

+

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

@@ -33,7 +38,12 @@

 #include <sys/types.h>

 #ifndef	C_WINDOWS

 #include <dirent.h>

+

 #include <sys/socket.h>

+#ifdef HAVE_FD_PASSING

+#include <sys/uio.h>

+#endif

+

 #include <sys/time.h>

 #endif

 #include <pthread.h>

@@ -54,12 +64,57 @@

 #include "server.h"

 #include "session.h"

+#ifdef HAVE_FD_PASSING

+static int recvfd_and_scan(int desc, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt)

+{

+	struct msghdr msg;

+	struct cmsghdr *cmsg;

+	unsigned char buf[CMSG_SPACE(sizeof(int))];

+	struct iovec iov[1];

+	char dummy;

+	int ret=-1;

+

+	memset(&msg, 0, sizeof(msg));

+	iov[0].iov_base = &dummy;

+	iov[0].iov_len = 1;

+	msg.msg_iov = iov;

+	msg.msg_iovlen = 1;

+	msg.msg_control = buf;

+	msg.msg_controllen = sizeof(buf);

+

+	if (recvmsg(desc, &msg, 0) == -1) {

+	    logg("recvmsg failed: %s!", strerror(errno));

+	    return -1;

+	}

+	if ((msg.msg_flags & MSG_TRUNC) || (msg.msg_flags & MSG_CTRUNC)) {

+	    logg("control message truncated");

+	    return -1;

+	}

+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;

+	    cmsg = CMSG_NXTHDR(&msg, cmsg)) {

+		if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)) &&

+		    cmsg->cmsg_level == SOL_SOCKET &&

+		    cmsg->cmsg_type == SCM_RIGHTS) {

+			int fd = *(int *)CMSG_DATA(cmsg);

+			ret = scanfd(fd, NULL, engine, limits, options, copt, desc);

+			close(fd);

+		}

+	}

+	return ret;

+}

+

+#else

+static int recvfd_and_scan(int desc)

+{

+	mdprintf(desc, "ERROR: FILDES support not compiled in\n");

+}

+#endif

+

 int command(int desc, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int timeout)

 {

 	char buff[1025];

 	int bread, opt;

-

     bread = readsock(desc, buff, sizeof(buff)-1, '\n', timeout, 0, 1);

     if(bread == -2) /* timeout */

 	return -2;

@@ -140,6 +195,10 @@ int command(int desc, const struct cl_engine *engine, const struct cl_limits *li

 	    if(cfgopt(copt, "ExitOnOOM")->enabled)

 		return COMMAND_SHUTDOWN;

+    } else if(!strncmp(buff, CMD14, strlen(CMD14))) { /* FILDES */

+	if(recvfd_and_scan(desc, engine, limits, options, copt) == -2)

+	    if(cfgopt(copt, "ExitOnOOM")->enabled)

+		return COMMAND_SHUTDOWN;

     } else {

 	mdprintf(desc, "UNKNOWN COMMAND\n");

     }

@@ -37,6 +37,7 @@

 #define CMD11 "SHUTDOWN"

 /* #define CMD12 "FD" */

 #define CMD13 "MULTISCAN"

+#define CMD14 "FILDES"

 #include "libclamav/clamav.h"

 #include "shared/cfgparser.h"

@@ -56,8 +56,8 @@ subdir = clamdscan

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/configure.in

+	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 mkinstalldirs = $(install_sh) -d

@@ -57,8 +57,8 @@ subdir = clamscan

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/configure.in

+	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 mkinstalldirs = $(install_sh) -d

@@ -43,7 +43,7 @@ EXIT_FAILURE=1

 PROGRAM=ltmain.sh

 PACKAGE=libtool

-VERSION="1.5.26 Debian 1.5.26-3"

+VERSION="1.5.26 Debian 1.5.26-4"

 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"

 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

@@ -1520,6 +1520,7 @@ Optional Features:

   --enable-bigstack	  increase thread stack size

   --disable-gethostbyname_r	  disable support for gethostbyname_r

   --enable-readdir_r		    enable support for readdir_r

+  --disable-fdpassing        don't build file descriptor passing support

 Optional Packages:

   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

@@ -4766,7 +4767,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 4769 "configure"' > conftest.$ac_ext

+  echo '#line 4770 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -6856,11 +6857,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:6859: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:6860: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:6863: \$? = $ac_status" >&5

+   echo "$as_me:6864: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -7146,11 +7147,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7149: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7150: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7153: \$? = $ac_status" >&5

+   echo "$as_me:7154: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -7250,11 +7251,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7253: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7254: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:7257: \$? = $ac_status" >&5

+   echo "$as_me:7258: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -9627,7 +9628,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9630 "configure"

+#line 9631 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9727,7 +9728,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9730 "configure"

+#line 9731 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -16329,15 +16330,6 @@ _ACEOF

 	fi

     fi

-    case `uname -r` in

-    1.*|2.0.*)

-

-cat >>confdefs.h <<\_ACEOF

-#define INCOMPLETE_CMSG 1

-_ACEOF

-

-       ;;

-    esac

     ;;

 kfreebsd*-gnu)

@@ -16507,11 +16499,9 @@ _ACEOF

     ;;

 openbsd*)

     if test "$have_pthreads" = "yes"; then

-	if test "$use_cr" = "no"; then

-	    THREAD_LIBS="-pthread"

-	else

-	    THREAD_LIBS="-pthread -lc_r"

-	fi

+	THREAD_LIBS="-pthread"

+	CLAMD_LIBS="$CLAMD_LIBS -pthread"

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"

 	TH_SAFE="-thread-safe"

 cat >>confdefs.h <<\_ACEOF

@@ -17238,241 +17228,6 @@ fi

-for ac_func in recvmsg sendmsg

-do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-  cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */

-#define $ac_func innocuous_$ac_func

-

-/* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.

-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

-    <limits.h> exists even on freestanding compilers.  */

-

-#ifdef __STDC__

-# include <limits.h>

-#else

-# include <assert.h>

-#endif

-

-#undef $ac_func

-

-/* Override any GCC internal prototype to avoid an error.

-   Use char because int might match the return type of a GCC

-   builtin and then its argument prototype would still apply.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-char $ac_func ();

-/* The GNU C library defines this for functions which it implements

-    to always fail with ENOSYS.  Some functions are actually named

-    something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func

-choke me

-#endif

-

-int

-main ()

-{

-return $ac_func ();

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_link") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest$ac_exeext &&

-       $as_test_x conftest$ac_exeext; then

-  eval "$as_ac_var=yes"

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-	eval "$as_ac_var=no"

-fi

-

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

-      conftest$ac_exeext conftest.$ac_ext

-fi

-ac_res=`eval echo '${'$as_ac_var'}'`

-	       { echo "$as_me:$LINENO: result: $ac_res" >&5

-echo "${ECHO_T}$ac_res" >&6; }

-if test `eval echo '${'$as_ac_var'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

-_ACEOF

-

-fi

-done

-

-{ echo "$as_me:$LINENO: checking for msg_accrights field in struct msghdr" >&5

-echo $ECHO_N "checking for msg_accrights field in struct msghdr... $ECHO_C" >&6; }

-if test "${ac_cv_have_accrights_in_msghdr+set}" = set; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-

-    cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-#include <sys/types.h>

-#include <sys/socket.h>

-#include <sys/uio.h>

-

-int

-main ()

-{

-

-#ifdef msg_accrights

-#error msg_accrights defined

-#endif

-struct msghdr m;

-m.msg_accrights = 0;

-return 0;

-

-

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_compile") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest.$ac_objext; then

-  ac_cv_have_accrights_in_msghdr="yes"

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-	ac_cv_have_accrights_in_msghdr="no"

-fi

-

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-

-fi

-{ echo "$as_me:$LINENO: result: $ac_cv_have_accrights_in_msghdr" >&5

-echo "${ECHO_T}$ac_cv_have_accrights_in_msghdr" >&6; }

-if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then

-

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_ACCRIGHTS_IN_MSGHDR 1

-_ACEOF

-

-fi

-

-{ echo "$as_me:$LINENO: checking for msg_control field in struct msghdr" >&5

-echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6; }

-if test "${ac_cv_have_control_in_msghdr+set}" = set; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-

-    cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-#include <sys/types.h>

-#include <sys/socket.h>

-#include <sys/uio.h>

-

-int

-main ()

-{

-

-#ifdef msg_control

-#error msg_control defined

-#endif

-struct msghdr m;

-m.msg_control = 0;

-return 0;

-

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_compile") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest.$ac_objext; then

-   ac_cv_have_control_in_msghdr="yes"

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-	 ac_cv_have_control_in_msghdr="no"

-fi

-

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-

-fi

-{ echo "$as_me:$LINENO: result: $ac_cv_have_control_in_msghdr" >&5

-echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6; }

-if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then

-

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_CONTROL_IN_MSGHDR 1

-_ACEOF

-

-fi

-

-

 # Check whether --with-tcpwrappers was given.

 if test "${with_tcpwrappers+set}" = set; then

   withval=$with_tcpwrappers;  case "$withval" in

@@ -17639,6 +17394,9 @@ cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

+#ifdef HAVE_SYS_TYPES_H

+#include <sys/types.h>

+#endif

 #include <tcpd.h>

 int allow_severity = 0;

 int deny_severity  = 0;

@@ -17691,6 +17449,9 @@ cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

+#ifdef HAVE_SYS_TYPES_H

+#include <sys/types.h>

+#endif

 #include <tcpd.h>

 int allow_severity = 0;

 int deny_severity  = 0;

@@ -18900,6 +18661,565 @@ fi

 { echo "$as_me:$LINENO: result: $have_signed_rightshift_extended" >&5

 echo "${ECHO_T}$have_signed_rightshift_extended" >&6; };

+

+

+

+for ac_func in recvmsg sendmsg

+do

+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */

+#define $ac_func innocuous_$ac_func

+

+/* System header to define __stub macros and hopefully few prototypes,

+    which can conflict with char $ac_func (); below.

+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

+    <limits.h> exists even on freestanding compilers.  */

+

+#ifdef __STDC__

+# include <limits.h>

+#else

+# include <assert.h>

+#endif

+

+#undef $ac_func

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char $ac_func ();

+/* The GNU C library defines this for functions which it implements

+    to always fail with ENOSYS.  Some functions are actually named

+    something starting with __ and the normal name is an alias.  */

+#if defined __stub_$ac_func || defined __stub___$ac_func

+choke me

+#endif

+

+int

+main ()

+{

+return $ac_func ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  eval "$as_ac_var=yes"

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	eval "$as_ac_var=no"

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+fi

+ac_res=`eval echo '${'$as_ac_var'}'`

+	       { echo "$as_me:$LINENO: result: $ac_res" >&5

+echo "${ECHO_T}$ac_res" >&6; }

+if test `eval echo '${'$as_ac_var'}'` = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

+_ACEOF

+

+fi

+done

+

+{ echo "$as_me:$LINENO: checking for msg_control field in struct msghdr" >&5

+echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6; }

+if test "${ac_cv_have_control_in_msghdr+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+

+    cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+#define _XOPEN_SOURCE 500

+#include <sys/types.h>

+#include <sys/socket.h>

+#include <sys/uio.h>

+

+int

+main ()

+{

+

+#ifdef msg_control

+#error msg_control defined

+#endif

+struct msghdr m;

+m.msg_control = 0;

+return 0;

+

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext

+if { (ac_try="$ac_compile"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_compile") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

+   ac_cv_have_control_in_msghdr="yes"

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	 ac_cv_have_control_in_msghdr="no"

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_have_control_in_msghdr" >&5

+echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6; }

+if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_CONTROL_IN_MSGHDR 1

+_ACEOF

+

+

+        { echo "$as_me:$LINENO: checking BSD 4.4 / RFC2292 style fd passing" >&5

+echo $ECHO_N "checking BSD 4.4 / RFC2292 style fd passing... $ECHO_C" >&6; }

+    # Check whether --enable-fdpassing was given.

+if test "${enable_fdpassing+set}" = set; then

+  enableval=$enable_fdpassing; want_fdpassing=$enableval

+else

+  want_fdpassing="yes"

+fi

+

+

+    if test "x$want_fdpassing" = "xyes"; then

+                if test "$cross_compiling" = yes; then

+  have_fdpass=0

+else

+  cat >conftest.$ac_ext <<_ACEOF

+

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext