@@ -62,6 +62,7 @@ Code patches submitted by (in alphabetical order):

 Kamil Andrusz <wizz*mniam.net>

 Patrick Bihan-Faou <patrick*mindstep.com>

+Martin Blapp <mb*imp.ch>

 Len Budney <lbudney*pobox.com>

 Andrey Cherezov <andrey*cherezov.koenig.su>

 Alex Cherney <alex*cher.id.au>

@@ -76,11 +77,13 @@ Jens Elkner <elkner*linofee.org>

 Jason Englander <jason*englanders.cc>

 Tony Finch <dot*dotat.at>

 David Ford <david+cert*blue-labs.org>

+Piotr Gackiewicz <gacek*intertele.pl>

 Dean Gaudet <dean-clamav*arctic.org>

 Michel Gaudet <Michel.Gaudet*ehess.fr>

 Philippe Gay <ph.gay*free.fr>

 Luca 'NERvOus' Gibelli <nervous*clamav.net>

 Scott Gifford <sgifford*suspectclass.com>

+Stephen Gran <steve*lobefin.net>

 Nigel Horne <njh*smsltd.demon.co.uk>

 Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>

 Robert Hogan <robert*roberthogan.net>

@@ -110,6 +113,7 @@ Masaki Ogawa <proc*mac.com>

 Phil Oleson <oz*nixil.net>

 Rudolph Pereira <r.pereira*isu.usyd.edu.au>

 Ed Phillips <ed*UDel.Edu>

+Pierre <pierrezero*fastmail.fm>

 Andreas Piesk <Andreas.Piesk*heise.de>

 Ant La Porte <ant*dvere.net>

 Thomas Quinot <thomas*cuivre.fr.eu.org>

@@ -1,3 +1,26 @@

+Thu Jul 29 14:17:42 CEST 2004

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

+  V 0.75.1, backported changes:

+

+  * freshclam/clamd:	    fix crash on PPC when LogFile was enabled together

+			    with LogSyslog

+  * configure:		    improve gethostbyname_r check; cleanups

+  * clamav-milter:	    Use GETHOSTBYNAME_R_6

+			    Better load balancing if max_children = 0

+  * clamdscan:		    fix stdin scanning in local mode (patch by Stephen

+			    Gran <steve*lobefin.net>)

+  * clamav-milter:	    %v in the template file handling is now replaced

+			    only with the virus name, no "stream:" appears

+  * libclamav/mbox.c:	    Fix crash when debugging on SPARC

+  * libclamav/message.c:    Fix occasional crash when scanning

+			    multipart within multipart e-mails

+  * clamav-milter:	    Fixed warning message when building on FreeBSD4.9

+			    Closed (small) memory leak

+			    Fix crash when the 1st remote service goes down

+			    Only use gethostbyname_r on LINUX for now

+			    Improved load balancing a bit

+

+

 Thu Jul 22 21:31:41 CEST 2004

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

   V 0.75, backported changes:

@@ -84,8 +84,14 @@

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

 #undef HAVE_FSEEKO

-/* Define to 1 if you have the `gethostbyname_r' function. */

-#undef HAVE_GETHOSTBYNAME_R

+/* gethostbyname_r takes 3 arguments */

+#undef HAVE_GETHOSTBYNAME_R_3

+

+/* gethostbyname_r takes 5 arguments */

+#undef HAVE_GETHOSTBYNAME_R_5

+

+/* gethostbyname_r takes 6 arguments */

+#undef HAVE_GETHOSTBYNAME_R_6

 /* Define to 1 if you have the `getpagesize' function. */

 #undef HAVE_GETPAGESIZE

@@ -105,6 +111,9 @@

 /* in_port_t is defined */

 #undef HAVE_IN_PORT_T

+/* Define to 1 if you have the <libmilter/mfapi.h> header file. */

+#undef HAVE_LIBMILTER_MFAPI_H

+

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

 #undef HAVE_LIMITS_H

@@ -439,6 +439,14 @@ Changes

 		machines running Solaris

 0.74f	22/7/04	Use gethostbyname_r() if available

 0.75	22/7/04	Up-issue

+0.75a	25/7/04	Fixed warning message when building on FreeBSD4.9

+		Closed (small) memory leak

+		Fix crash when the 1st remote service goes down

+		Only use gethostbyname_r on LINUX for now

+		Load balancing - improved a bit - but still some way to go

+0.75b	26/7/04	Template file: %v now prints the virus name without the trailer

+0.75c	29/7/04	Better load balancing if max_children = 0

+		Use HAVE_GETHOSTBYNAME_R_6

 BUG REPORTS

@@ -26,6 +26,15 @@

  *

  * Change History:

  * $Log: clamav-milter.c,v $

+ * Revision 1.111  2004/07/29 06:38:05  nigelhorne

+ * GETHOSTBYNAME_R_6

+ *

+ * Revision 1.110  2004/07/26 13:23:27  nigelhorne

+ * Remove stream: from template %v

+ *

+ * Revision 1.109  2004/07/25 11:51:42  nigelhorne

+ * Fix crash if 1st host dies

+ *

  * Revision 1.108  2004/07/22 15:45:03  nigelhorne

  * Up-issue

  *

@@ -335,9 +344,9 @@

  * Revision 1.6  2003/09/28 16:37:23  nigelhorne

  * Added -f flag use MaxThreads if --max-children not set

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.108 2004/07/22 15:45:03 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.111 2004/07/29 06:38:05 nigelhorne Exp $";

-#define	CM_VERSION	"0.75"

+#define	CM_VERSION	"0.75c"

 /*#define	CONFDIR	"/usr/local/etc"*/

@@ -367,6 +376,7 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.108 2004/07/22 15:45:03 ni

 #include <string.h>

 #include <sys/wait.h>

 #include <assert.h>

+#include <netinet/in.h>

 #include <arpa/inet.h>

 #include <sys/socket.h>

 #include <sys/un.h>

@@ -375,7 +385,6 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.108 2004/07/22 15:45:03 ni

 #include <libmilter/mfapi.h>

 #include <pthread.h>

 #include <sys/time.h>

-#include <netinet/in.h>

 #include <signal.h>

 #include <regex.h>

 #include <fcntl.h>

@@ -483,7 +492,7 @@ static	void	header_list_add(header_list_t list, const char *headerf, const char

 static	void	header_list_print(header_list_t list, FILE *fp);

 static	int	connect2clamd(struct privdata *privdata);

 static	void	checkClamd(void);

-static	int	sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *clamdMessage);

+static	int	sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *virusname);

 static	void	setsubject(SMFICTX *ctx, const char *virusname);

 static	char	clamav_version[128];

@@ -1104,7 +1113,7 @@ main(int argc, char **argv)

 			if(pingServer(i))

 				activeServers++;

 			else {

-				cli_warnmsg("Warning Can't talk to clamd server %s on port %d\n",

+				cli_warnmsg("Can't talk to clamd server %s on port %d\n",

 					hostname, tcpSocket);

 			}

 			free(hostname);

@@ -1355,7 +1364,7 @@ static int

 findServer(void)

 {

 	struct sockaddr_in *servers, *server;

-	int *socks, maxsock = 0, i;

+	int *socks, maxsock = 0, i, j;

 	fd_set rfds;

 	struct timeval tv;

 	int retval;

@@ -1371,12 +1380,20 @@ findServer(void)

 	FD_ZERO(&rfds);

+	if(max_children > 0)

+		j = n_children - 1;	/* Don't worry about no lock */

+	else

+		j = cl_rndnum(numServers) - 1;

+

 	for(i = 0, server = servers; i < numServers; i++, server++) {

 		int sock;

 		server->sin_family = AF_INET;

 		server->sin_port = (in_port_t)htons(tcpSocket);

-		server->sin_addr.s_addr = serverIPs[i];

+		server->sin_addr.s_addr = serverIPs[(i + j) % numServers];

+

+		cli_dbgmsg("findServer: try server %d\n",

+			(i + j) % numServers);

 		sock = socks[i] = socket(AF_INET, SOCK_STREAM, 0);

 		if(sock < 0) {

@@ -1392,14 +1409,15 @@ findServer(void)

 		if((connect(sock, (struct sockaddr *)server, sizeof(struct sockaddr)) < 0) ||

 		   (send(sock, "PING\n", 5, 0) < 5)) {

-			const char *hostname = cli_strtok(serverHostNames, i, ":");

+			char *hostname = cli_strtok(serverHostNames, i, ":");

 			cli_warnmsg("Check clamd server %s - it may be down\n", hostname);

 			if(use_syslog)

 				syslog(LOG_WARNING,

 					"Check clamd server %s - it may be down",

 					hostname);

-			socks[i] = -1;

 			close(sock);

+			free(hostname);

+			socks[i] = -1;

 			continue;

 		}

@@ -1437,10 +1455,12 @@ findServer(void)

 	}

 	for(i = 0; i < numServers; i++)

-		if(FD_ISSET(socks[i], &rfds)) {

+		if((socks[i] >= 0) && (FD_ISSET(socks[i], &rfds))) {

+			const int server = (i + j) % numServers;

+

 			free(socks);

-			cli_dbgmsg("findServer: using server %d\n", i);

-			return i;

+			cli_dbgmsg("findServer: using server %d\n", server);

+			return server;

 		}

 	free(socks);

@@ -1508,7 +1528,11 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 	 */

 	if(strncasecmp(port, "inet:", 5) == 0) {

 		const char *hostmail;

-#ifdef	HAVE_GETHOSTBYNAME_R

+		/*

+		 * TODO: gethostbyname_r is non-standard so different operating

+		 * systems do it in different ways. Need more examples

+		 */

+#ifdef	HAVE_GETHOSTBYNAME_R_6

 		struct hostent *hp, hostent;

 		char buf[BUFSIZ];

 		int ret;

@@ -1527,7 +1551,7 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 			hostmail = "unknown";

 		}

-#ifdef	HAVE_GETHOSTBYNAME_R

+#ifdef	HAVE_GETHOSTBYNAME_R_6

 		if(gethostbyname_r(hostmail, &hostent, buf, sizeof(buf), &hp, &ret) != 0) {

 			if(use_syslog)

 				syslog(LOG_WARNING, "Access Denied: Host Unknown (%s)", hostname);

@@ -2009,6 +2033,11 @@ clamfi_eom(SMFICTX *ctx)

 			syslog(LOG_DEBUG, "clamfi_eom: read %s", mess);

 		cli_dbgmsg("clamfi_eom: read %s\n", mess);

 	} else {

+		/*

+		 * TODO: if more than one host has been specified, try

+		 * another one - setting cl_error to SMFIS_TEMPFAIL helps

+		 * by forcing a retry

+		 */

 		clamfi_cleanup(ctx);

 		syslog(LOG_NOTICE, "clamfi_eom: read nothing from clamd");

 #ifdef	CL_DEBUG

@@ -2183,6 +2212,16 @@ clamfi_eom(SMFICTX *ctx)

 			 * item in the queue so there's no scanning of two

 			 * messages at once. It'll still be scanned, but

 			 * not at the same time as the incoming message

+			 *

+			 * FIXME: there is a race condition here. If the

+			 * system is very overloaded this sendmail can

+			 * take a long time to start - and may even fail

+			 * is the LA is > REFUSE_LA. In all the time we're

+			 * taking to start this sendmail, the sendmail that's

+			 * started us may timeout waiting for a response and

+			 * let the virus through (albeit tagged with

+			 * X-Virus-Status: Infected) because we haven't

+			 * sent SMFIS_DISCARD or SMFIS_REJECT

 			 */

 			snprintf(cmd, sizeof(cmd) - 1,

 				(oflag || fflag) ? "%s -t -odq" : "%s -t",

@@ -2232,7 +2271,7 @@ clamfi_eom(SMFICTX *ctx)

 				fputs("Subject: Virus intercepted\n\n", sendmail);

 				if((templatefile == NULL) ||

-				   (sendtemplate(ctx, templatefile, sendmail, mess) < 0)) {

+				   (sendtemplate(ctx, templatefile, sendmail, virusname) < 0)) {

 					if(bflag)

 						fputs("A message you sent to\n", sendmail);

 					else if(pflag)

@@ -2470,9 +2509,7 @@ clamfi_free(struct privdata *privdata)

 		cli_dbgmsg("pthread_cond_broadcast\n");

 #endif

 		pthread_cond_broadcast(&n_children_cond);

-#ifdef	CL_DEBUG

 		cli_dbgmsg("<n_children = %d\n", n_children);

-#endif

 		pthread_mutex_unlock(&n_children_mutex);

 	}

 }

@@ -3000,15 +3037,16 @@ checkClamd(void)

  * Send a templated message about an intercepted message. Very basic for

  * now, just to prove it works, will enhance the flexability later, only

  * supports %v and {sendmail_variables} at present. And only one instance of

- * %v at that.

+ * %v or {sendmail_variable} at that.

  *

  * TODO: more template features

  * TODO: allow filename to start with a '|' taken to mean the output of

  *	a program

  * TODO: allow { to be escaped with a \ character

+ * TODO: allow more than one substitution in a file

  */

 static int

-sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *clamdMessage)

+sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *virusname)

 {

 	FILE *fin = fopen(filename, "r");

 	struct stat statb;

@@ -3042,14 +3080,14 @@ sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *cla

 	fread(buf, sizeof(char), statb.st_size, fin);

 	fclose(fin);

 	buf[statb.st_size] = '\0';

+	rc = 0;

 	/* FIXME: \%v should be %%v */

 	if(((ptr = strstr(buf, "%v")) != NULL) && (strstr(buf, "\\%v") == NULL)) {

 		*ptr = '\0';

 		ptr = &ptr[2];

 		fputs(buf, sendmail);

-		/* Need to peel out the virus name and just send that */

-		fputs(clamdMessage, sendmail);

+		fputs(virusname, sendmail);

 		rc = (fputs(ptr, sendmail) == EOF) ? -1 : 0;

 	} else if((ptr = strchr(buf, '{')) && (ptr2 = strchr(ptr, '}'))) {

 		char *var;

@@ -3076,7 +3114,7 @@ sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *cla

 	free(buf);

-	return 0;

+	return rc;

 }

 /*

@@ -138,7 +138,17 @@ int dsstream(int sockd)

 	return -1;

     }

-    server.sin_addr.s_addr = peer.sin_addr.s_addr;

+    switch (peer.sin_family) {

+	case AF_UNIX:

+	    server.sin_addr.s_addr = inet_addr("127.0.0.1");

+	    break;

+	case AF_INET:

+	    server.sin_addr.s_addr = peer.sin_addr.s_addr;

+	    break;

+	default:

+	    mprintf("@Unexpected socket type: %d.\n", peer.sin_family);

+	    return -1;

+    }

     if(connect(wsockd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) < 0) {

 	close(wsockd);

@@ -1017,7 +1017,7 @@ Optional Features:

   --disable-libtool-lock  avoid locking (might break parallel builds)

   --disable-bzip2	  Disable bzip2 support.

   --disable-clamuko	  Disable clamuko support (Linux and FreeBSD only)

-  --enable-milter	  Build clamav-milter (if milter library found)

+  --enable-milter	  Build clamav-milter

   --disable-dsig	  Disable digital signature support.

   --disable-pthreads      Disable POSIX threads support

   --disable-cr      Don't link with C reentrant library (BSD)

@@ -2055,7 +2055,7 @@ fi

 # Define the identity of the package.

  PACKAGE=clamav

- VERSION="0.75"

+ VERSION="0.75.1"

 cat >>confdefs.h <<_ACEOF

@@ -8974,8 +8974,7 @@ _ACEOF

-

-for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop setgroups initgroups gethostbyname_r

+for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop setgroups initgroups

 do

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

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

@@ -9674,7 +9673,6 @@ _ACEOF

 fi

-# Check for broken snprintf

 if test "x$ac_cv_func_snprintf" = "xyes" ; then

         echo "$as_me:$LINENO: checking whether snprintf correctly terminates long strings" >&5

 echo $ECHO_N "checking whether snprintf correctly terminates long strings... $ECHO_C" >&6

@@ -10018,7 +10016,9 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

 else

-  echo "Please install zlib and zlib-devel packages."; exit 1

+  { { echo "$as_me:$LINENO: error: Please install zlib and zlib-devel packages" >&5

+echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

+   { (exit 1); exit 1; }; }

 fi

@@ -10032,6 +10032,77 @@ fi;

 if test "$want_bzip2" = "yes"

 then

+    echo "$as_me:$LINENO: checking for bzReadOpen in -lbz2" >&5

+echo $ECHO_N "checking for bzReadOpen in -lbz2... $ECHO_C" >&6

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

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

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lbz2  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

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

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char bzReadOpen ();

+int

+main ()

+{

+bzReadOpen ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+  ac_cv_lib_bz2_bzReadOpen=yes

+else

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

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

+

+ac_cv_lib_bz2_bzReadOpen=no

+fi

+rm -f conftest.err conftest.$ac_objext \

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzReadOpen" >&5

+echo "${ECHO_T}$ac_cv_lib_bz2_bzReadOpen" >&6

+if test $ac_cv_lib_bz2_bzReadOpen = yes; then

+

+cat >>confdefs.h <<\_ACEOF

+#define NOBZ2PREFIX 1

+_ACEOF

+

+fi

+

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

   echo "$as_me:$LINENO: checking for bzlib.h" >&5

 echo $ECHO_N "checking for bzlib.h... $ECHO_C" >&6

@@ -10175,81 +10246,11 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

 else

-  echo "WARNING: Bzip2 support disabled"

+  { echo "$as_me:$LINENO: WARNING: ****** bzip2 support disabled" >&5

+echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}

 fi

-    echo "$as_me:$LINENO: checking for bzReadOpen in -lbz2" >&5

-echo $ECHO_N "checking for bzReadOpen in -lbz2... $ECHO_C" >&6

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

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

-else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-lbz2  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

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

-#ifdef __cplusplus

-extern "C"

-#endif

-/* We use char because int might match the return type of a gcc2

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

-char bzReadOpen ();

-int

-main ()

-{

-bzReadOpen ();

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&

-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

-  ac_cv_lib_bz2_bzReadOpen=yes

-else

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

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

-

-ac_cv_lib_bz2_bzReadOpen=no

-fi

-rm -f conftest.err conftest.$ac_objext \

-      conftest$ac_exeext conftest.$ac_ext

-LIBS=$ac_check_lib_save_LIBS

-fi

-echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzReadOpen" >&5

-echo "${ECHO_T}$ac_cv_lib_bz2_bzReadOpen" >&6

-if test $ac_cv_lib_bz2_bzReadOpen = yes; then

-

-cat >>confdefs.h <<\_ACEOF

-#define NOBZ2PREFIX 1

-_ACEOF

-

-fi

-

 fi

 want_clamuko="yes"

@@ -10324,153 +10325,10 @@ _ACEOF

 fi

-have_milter="no"

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

-  echo "$as_me:$LINENO: checking for libmilter/mfapi.h" >&5

-echo $ECHO_N "checking for libmilter/mfapi.h... $ECHO_C" >&6

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

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

-fi

-echo "$as_me:$LINENO: result: $ac_cv_header_libmilter_mfapi_h" >&5

-echo "${ECHO_T}$ac_cv_header_libmilter_mfapi_h" >&6

-else

-  # Is the header compilable?

-echo "$as_me:$LINENO: checking libmilter/mfapi.h usability" >&5

-echo $ECHO_N "checking libmilter/mfapi.h usability... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-$ac_includes_default

-#include <libmilter/mfapi.h>

-_ACEOF

-rm -f conftest.$ac_objext

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&

-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

-  ac_header_compiler=yes

-else

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

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

-

-ac_header_compiler=no

-fi

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

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

-echo "${ECHO_T}$ac_header_compiler" >&6

-

-# Is the header present?

-echo "$as_me:$LINENO: checking libmilter/mfapi.h presence" >&5

-echo $ECHO_N "checking libmilter/mfapi.h presence... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-#include <libmilter/mfapi.h>

-_ACEOF

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

-  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

-  ac_header_preproc=yes

-else

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

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

-

-  ac_header_preproc=no

-fi

-rm -f conftest.err conftest.$ac_ext

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

-echo "${ECHO_T}$ac_header_preproc" >&6

-

-# So?  What about this header?

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

-  yes:no: )

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: accepted by the compiler, rejected by the preprocessor!" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: proceeding with the compiler's result" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: proceeding with the compiler's result" >&2;}

-    ac_header_preproc=yes

-    ;;

-  no:yes:* )

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: present but cannot be compiled" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: present but cannot be compiled" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h:     check for missing prerequisite headers?" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h:     check for missing prerequisite headers?" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: see the Autoconf documentation" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: see the Autoconf documentation" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h:     section \"Present But Cannot Be Compiled\"" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: proceeding with the preprocessor's result" >&2;}

-    { echo "$as_me:$LINENO: WARNING: libmilter/mfapi.h: in the future, the compiler will take precedence" >&5

-echo "$as_me: WARNING: libmilter/mfapi.h: in the future, the compiler will take precedence" >&2;}

-    (

-      cat <<\_ASBOX

-## ------------------------------------------ ##

-## Report this to the AC_PACKAGE_NAME lists.  ##

-## ------------------------------------------ ##

-_ASBOX

-    ) |

-      sed "s/^/$as_me: WARNING:     /" >&2

-    ;;

-esac

-echo "$as_me:$LINENO: checking for libmilter/mfapi.h" >&5

-echo $ECHO_N "checking for libmilter/mfapi.h... $ECHO_C" >&6

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

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

-else

-  ac_cv_header_libmilter_mfapi_h=$ac_header_preproc

-fi

-echo "$as_me:$LINENO: result: $ac_cv_header_libmilter_mfapi_h" >&5

-echo "${ECHO_T}$ac_cv_header_libmilter_mfapi_h" >&6

-

-fi

-if test $ac_cv_header_libmilter_mfapi_h = yes; then

-  have_milter="yes"

-fi

-

-

-

 # Check whether --enable-milter or --disable-milter was given.

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

   enableval="$enable_milter"

-

+  have_milter=$enableval

 else

   have_milter="no"

 fi;

@@ -10624,7 +10482,8 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

 else

-  echo "WARNING: GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"

+  { echo "$as_me:$LINENO: WARNING: ****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !" >&5

+echo "$as_me: WARNING: ****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !" >&2;}; want_dsig="no"

 fi

 fi

@@ -10929,7 +10788,6 @@ _ACEOF

 DBDIR="$db_dir"

-# config file

 cfg_dir=`echo $sysconfdir | grep prefix`

 if test -n "$cfg_dir"; then

@@ -10972,7 +10830,6 @@ else

 fi

-# check for in_port_t definition

 if test "$cross_compiling" = yes; then

   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling

 See \`config.log' for more details." >&5

@@ -11040,7 +10897,7 @@ cat >>confdefs.h <<\_ACEOF

 #define _REENTRANT 1

 _ACEOF

-	CLAMD_LIBS="-lpthread"

+	CLAMD_LIBS="$CLAMD_LIBS -lpthread"

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

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

@@ -11049,7 +10906,7 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

 	fi

-	CLAMSCAN_LIBS="-lpthread"

+	CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"

     fi

     ;;

 cygwin*)

@@ -11079,11 +10936,11 @@ _ACEOF

     fi

     ;;

 solaris*)

-    FRESHCLAM_LIBS="-lsocket -lnsl -lresolv"

+    FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

-	CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"

-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lsocket -lnsl -lresolv"

+	CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"

+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"

 	TH_SAFE="-thread-safe"

 cat >>confdefs.h <<\_ACEOF

@@ -11105,7 +10962,7 @@ _ACEOF

 freebsd*)

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"

-	CLAMD_LIBS="-pthread -lc_r"

+	CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"

 	TH_SAFE="-thread-safe"

@@ -11136,7 +10993,7 @@ openbsd3.3*)

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"

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

-	    CLAMD_LIBS="-pthread"

+	    CLAMD_LIBS="$CLAMD_LIBS -pthread"

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"

 	fi

 	TH_SAFE="-thread-safe"

@@ -11161,10 +11018,10 @@ openbsd*)

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"

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

-	    CLAMD_LIBS="-pthread"

+	    CLAMD_LIBS="$CLAMD_LIBS -pthread"

 	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"

 	else

-	    CLAMD_LIBS="-pthread -lc_r"

+	    CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"

 	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"

 	fi

 	TH_SAFE="-thread-safe"

@@ -11242,14 +11099,11 @@ _ACEOF

     use_netinfo="yes"

     ;;

 sco*)

-        FRESHCLAM_LIBS="-lsocket"

-    CLAMD_LIBS="-lsocket"

-    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"

-    ;;

+                    ;;

 hpux*)

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

-	CLAMD_LIBS="-lpthread"

+	CLAMD_LIBS="$CLAMD_LIBS -lpthread"

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

 	TH_SAFE="-thread-safe"

@@ -11272,7 +11126,7 @@ _ACEOF

 aix*)

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

-	CLAMD_LIBS="-lpthread"

+	CLAMD_LIBS="$CLAMD_LIBS -lpthread"

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

 	TH_SAFE="-thread-safe"

@@ -11295,7 +11149,7 @@ _ACEOF

 irix*)

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

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

-	CLAMD_LIBS="-lpthread"

+	CLAMD_LIBS="$CLAMD_LIBS -lpthread"

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

 	TH_SAFE="-thread-safe"

@@ -11352,6 +11206,575 @@ esac

+echo "$as_me:$LINENO: checking for bind in -lsocket" >&5

+echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6

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

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

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lsocket  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

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

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char bind ();

+int

+main ()

+{

+bind ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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