@@ -1,3 +1,25 @@

+Thu Jul 22 21:31:41 CEST 2004

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

+  V 0.75, backported changes:

+

+  * clamav-milter: Use gethostbyname_r when available

+  * clamav-milter: Add mutex around gethostbyname

+  * clamav-milter: Add sanity check to clamfi_connect()

+  * libclamav/message.c: Code tidy - remove overlapping strcpy

+  * libclamav: Some MyDoom.I were getting through

+  * clamav-milter: Added --dont-wait and --advisory options

+  * libclamav/mbox.c: Better handling of Gibe.3 boundary exploit improves

+		      the speed of scanning other emails

+  * clamdscan: fix bug (introduced in -20040622) in stream scanning in TCP

+               mode. Patch by Piotr Gackiewicz <gacek*intertele.pl>.

+  * libclamav/mbox.c: Some TR.Happy99.SKA were getting through

+  * libclamav/mbox.c: Fix compilation error on old Solaris

+  * libclamav/ole2_extract.c: check against recursion limits

+

+Wed Jun 30 00:00:13 CEST 2004 (tk)

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

+  V 0.74 (Based on CVS, with PowerPoint-VBA, MSCAB, PE and UPX code excluded)

+

 Tue Jun 29 23:24:44 CEST 2004 (tk)

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

   * doc: update

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.8.3 from Makefile.am.

+# Makefile.in generated by automake 1.8.5 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -389,14 +389,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIE

 		$(TAGS_FILES) $(LISP)

 	tags=; \

 	here=`pwd`; \

-	if (etags --etags-include --version) >/dev/null 2>&1; then \

+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

 	  include_option=--etags-include; \

+	  empty_fix=.; \

 	else \

 	  include_option=--include; \

+	  empty_fix=; \

 	fi; \

 	list='$(SUBDIRS)'; for subdir in $$list; do \

 	  if test "$$subdir" = .; then :; else \

-	    test -f $$subdir/TAGS && \

+	    test ! -f $$subdir/TAGS || \

 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

 	  fi; \

 	done; \

@@ -406,9 +408,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIE

 	  done | \

 	  $(AWK) '    { files[$$0] = 1; } \

 	       END { for (i in files) print i; }'`; \

-	test -z "$(ETAGS_ARGS)$$tags$$unique" \

-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

-	     $$tags $$unique

+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

+	  test -n "$$unique" || unique=$$empty_fix; \

+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+	    $$tags $$unique; \

+	fi

 ctags: CTAGS

 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

@@ -517,7 +521,7 @@ distcheck: dist

 	*.tar.Z*) \

 	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\

 	*.shar.gz*) \

-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\

+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

 	*.zip*) \

 	  unzip $(distdir).zip ;;\

 	esac

@@ -2,6 +2,35 @@ Note: This README/NEWS file refers to the source tarball. Some things described

 here may not be available in binary packages.

 --

+0.75

+----

+

+This release fixes detection of e-mails generated by Worm.Mydoom.I.

+

+Important notice for people using ClamAV 0.60:

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+Our logs show that there is still a small percentage of ClamAV 0.60

+installations updating their database. ClamAV 0.60 was released on

+July 29th, 2003 and it was the last release to use the old database

+format. Starting from version 0.65, released on November 12nd, ClamAV

+uses a new database format, which is compressed and digitally signed.

+We have been distributing the database in both formats till now, but

+we plan to drop support for ClamAV 0.60 on September 1st.

+

+We encourage _all_ users to upgrade to the latest release available.

+People running an old version of ClamAV are missing many viruses and 

+may experience stability problems.

+

+On non-production systems you can try the latest development version.

+The new engine not only speeds up the scanning process but also limits

+memory usage by about 8 MB ! It's able to scan new formats, including

+CAB, CHM, UPX, HTML (normalisation), PowerPoint macros and can detect

+annoying e-mails with empty attachments generated by new Bagle variants.

+

+--

+The ClamAV team (http://www.clamav.net/team.html)

+

 0.74

 ----

@@ -2,6 +2,35 @@ Note: This README/NEWS file refers to the source tarball. Some things described

 here may not be available in binary packages.

 --

+0.75

+----

+

+This release fixes detection of e-mails generated by Worm.Mydoom.I.

+

+Important notice for people using ClamAV 0.60:

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+Our logs show that there is still a small percentage of ClamAV 0.60

+installations updating their database. ClamAV 0.60 was released on

+July 29th, 2003 and it was the last release to use the old database

+format. Starting from version 0.65, released on November 12nd, ClamAV

+uses a new database format, which is compressed and digitally signed.

+We have been distributing the database in both formats till now, but

+we plan to drop support for ClamAV 0.60 on September 1st.

+

+We encourage _all_ users to upgrade to the latest release available.

+People running an old version of ClamAV are missing many viruses and 

+may experience stability problems.

+

+On non-production systems you can try the latest development version.

+The new engine not only speeds up the scanning process but also limits

+memory usage by about 8 MB ! It's able to scan new formats, including

+CAB, CHM, UPX, HTML (normalisation), PowerPoint macros and can detect

+annoying e-mails with empty attachments generated by new Bagle variants.

+

+--

+The ClamAV team (http://www.clamav.net/team.html)

+

 0.74

 ----

@@ -1,4 +1,4 @@

-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-

+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004

 # Free Software Foundation, Inc.

@@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])

 # Call AM_AUTOMAKE_VERSION so it can be traced.

 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-	 [AM_AUTOMAKE_VERSION([1.8.3])])

+	 [AM_AUTOMAKE_VERSION([1.8.5])])

 # AM_AUX_DIR_EXPAND

@@ -266,9 +266,14 @@ AC_CACHE_CHECK([dependency style of $depcc],

        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

       # icc doesn't choke on unknown options, it will just issue warnings

-      # (even with -Werror).  So we grep stderr for any message

-      # that says an option was ignored.

-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else

+      # or remarks (even with -Werror).  So we grep stderr for any message

+      # that says an option was ignored or not supported.

+      # When given -MP, icc 7.0 and 7.1 complain thusly:

+      #   icc: Command line warning: ignoring option '-M'; no argument required

+      # The diagnosis changed in icc 8.0:

+      #   icc: Command line remark: option '-MP' not supported

+      if (grep 'ignoring option' conftest.err ||

+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

         am_cv_$1_dependencies_compiler_type=$depmode

         break

       fi

deleted file mode 100755

@@ -1,74 +0,0 @@

-#! /bin/sh

-# Originally from libxml, Copyright (C) Daniel Veillard

-

-prefix=/usr/local

-exec_prefix=${prefix}

-includedir=${prefix}/include

-libdir=${exec_prefix}/lib

-

-usage()

-{

-    cat <<EOF

-Usage: clamav-config [OPTION]

-

-Known values for OPTION are:

-

-  --prefix=DIR		change libclamav prefix [default $prefix]

-  --libs		print library linking information

-  --cflags		print pre-processor and compiler flags

-  --help		display this help and exit

-  --version		output version information

-EOF

-

-    exit $1

-}

-

-if test $# -eq 0; then

-    usage 1

-fi

-

-cflags=false

-libs=false

-

-while test $# -gt 0; do

-    case "$1" in

-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;

-    *) optarg= ;;

-    esac

-

-    case "$1" in

-    --prefix=*)

-	prefix=$optarg

-	;;

-

-    --prefix)

-	echo $prefix

-	;;

-

-    --version)

-	echo devel-20040627

-	exit 0

-	;;

-

-    --help)

-	usage 0

-	;;

-

-    --cflags)

-       	echo -I${prefix}/include -g -O2

-       	;;

-

-    --libs)

-       	echo -L${exec_prefix}/lib  -lz -lbz2 -lgmp -lpthread

-       	;;

-

-    *)

-	usage

-	exit 1

-	;;

-    esac

-    shift

-done

-

-exit 0

-

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

 /* 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

+

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

 #undef HAVE_GETPAGESIZE

@@ -64,6 +64,17 @@ INSTALLATION

 Install into /usr/local/sbin/clamav-milter.

+Ensure that your sendmail supports milters by running

+	/usr/lib/sendmail -d0 < /dev/null | fgrep MILTER

+or

+	/usr/sbin/sendmail -d0 < /dev/null | fgrep MILTER

+

+You should see something like:

+	MATCHGECOS MILTER MIME7TO8 MIME8TO7 NAMED_BIND NETINET NETINET6

+It doesn't matter exactly what you see, as long as the word MILTER is printed.

+

+If you see no output you MUST upgrade your sendmail.

+

 See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html

 Installations for RedHat Linux and it's derivatives such as YellowDog:

@@ -86,6 +97,9 @@ Installations for RedHat Linux and it's derivatives such as YellowDog:

 	chown clamav /var/run/clamav	(if you use User clamav in clamav.conf)

 	chmod 700 /var/run/clamav

+	Where /var/run/spamass.sock is the location of the spamass-milt

+	socket file (on some systems it is in /var/run/sendmail/spamass.sock).

+

 You may find INPUT_MAIL_FILTERS is not needed on your machine, however it

 is recommended by the Sendmail documentation and I recommend going along

 with that.

@@ -417,6 +431,14 @@ Changes

 			already exists

 0.74	29/6/04	Up-issued

 0.74a	29/6/04	Allow the child timeout to be configurable

+0.74b	8/7/04	Validate the arguments to inet_ntop

+0.74c	14/7/04	Added --dont-wait

+		Added --advisory

+0.74d	18/7/04	Added sanity check in clamfi_connect

+0.74e	21/7/04	Fixed thread unsafe code causing problems with multi-CPU

+		machines running Solaris

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

+0.75	22/7/04	Up-issue

 BUG REPORTS

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.8.3 from Makefile.am.

+# Makefile.in generated by automake 1.8.5 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -471,9 +471,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	  done | \

 	  $(AWK) '    { files[$$0] = 1; } \

 	       END { for (i in files) print i; }'`; \

-	test -z "$(ETAGS_ARGS)$$tags$$unique" \

-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

-	     $$tags $$unique

+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

+	  test -n "$$unique" || unique=$$empty_fix; \

+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+	    $$tags $$unique; \

+	fi

 ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

@@ -26,6 +26,24 @@

  *

  * Change History:

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

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

+ * Up-issue

+ *

+ * Revision 1.107  2004/07/22 09:14:32  nigelhorne

+ * Use gethostbyname_r when available

+ *

+ * Revision 1.106  2004/07/21 21:23:29  nigelhorne

+ * Mutex gethostbyname result

+ *

+ * Revision 1.105  2004/07/21 17:46:06  nigelhorne

+ * Added note about needing MILTER support in sendmail

+ *

+ * Revision 1.104  2004/07/14 10:17:05  nigelhorne

+ * Added dont-wait and advisory options

+ *

+ * Revision 1.103  2004/07/08 22:22:39  nigelhorne

+ * Don't pass empty arguments to inet_ntop

+ *

  * Revision 1.102  2004/06/29 15:26:14  nigelhorne

  * Support the --timeout argument

  *

@@ -317,9 +335,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.102 2004/06/29 15:26:14 nigelhorne Exp $";

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

-#define	CM_VERSION	"0.74a"

+#define	CM_VERSION	"0.75"

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

@@ -466,6 +484,7 @@ 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	void	setsubject(SMFICTX *ctx, const char *virusname);

 static	char	clamav_version[128];

 static	int	fflag = 0;	/* force a scan, whatever */

@@ -547,6 +566,16 @@ static	int	child_timeout = 60;	/* number of seconds to wait for

 					 * a child to die. Set to 0 to

 					 * wait forever

 					 */

+static	int	dont_wait = 0;	/*

+				 * If 1 send retry later to the remote end

+				 * if max_chilren is exceeded, otherwise we

+				 * wait for the number to go down

+				 */

+static	int	advisory = 0;	/*

+				 * Run clamav-milter in advisory mode - viruses

+				 * are flagged rather than deleted. Incompatible

+				 * with quarantine options

+				 */

 short	use_syslog = 0;

 static	const	char	*pidFile;

 static	int	logVerbose = 0;

@@ -578,11 +607,13 @@ help(void)

 	printf("\n\tclamav-milter version %s\n", CM_VERSION);

 	puts("\tCopyright (C) 2004 Nigel Horne <njh@despammed.com>\n");

+	puts("\t--advisory\t\t-A\tFlag viruses rather than deleting them.");

 	puts("\t--bounce\t\t-b\tSend a failure message to the sender.");

 	puts("\t--config-file=FILE\t-c FILE\tRead configuration from FILE.");

 	puts("\t--debug\t\t\t-D\tPrint debug messages.");

 	puts("\t--dont-log-clean\t-C\tDon't add an entry to syslog that a mail is clean.");

 	puts("\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error occurs.");

+	puts("\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded.");

 	puts("\t--from=EMAIL\t\t-a EMAIL\tError messages come from here.");

 	puts("\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l).");

 	puts("\t--help\t\t\t-h\tThis message.");

@@ -601,7 +632,7 @@ help(void)

 	puts("\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message.");

 	puts("\t--signature-file=FILE\t-F FILE\tLocation of signature file.");

 	puts("\t--template-file=FILE\t-t FILE\tLocation of e-mail template file.");

-	puts("\t--timeout=SECS\t-T SECS\tTimeout waiting to childen to die.");

+	puts("\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die.");

 	puts("\t--version\t\t-V\tPrint the version number of this software.");

 #ifdef	CL_DEBUG

 	puts("\t--debug-level=n\t\t-x n\tSets the debug level to 'n'.");

@@ -650,9 +681,9 @@ main(int argc, char **argv)

 	for(;;) {

 		int opt_index = 0;

 #ifdef	CL_DEBUG

-		const char *args = "a:bc:CDfF:lm:nNop:PqQ:dhHs:St:T:U:Vx:";

+		const char *args = "a:Abc:CDfF:lm:nNop:PqQ:dhHs:St:T:U:Vx:";

 #else

-		const char *args = "a:bc:CDfF:lm:nNop:PqQ:dhHs:St:T:U:V";

+		const char *args = "a:Abc:CDfF:lm:nNop:PqQ:dhHs:St:T:U:V";

 #endif

 		static struct option long_options[] = {

@@ -660,6 +691,9 @@ main(int argc, char **argv)

 				"from", 1, NULL, 'a'

 			},

 			{

+				"advisory", 0, NULL, 'A'

+			},

+			{

 				"bounce", 0, NULL, 'b'

 			},

 			{

@@ -672,6 +706,9 @@ main(int argc, char **argv)

 				"dont-scan-on-error", 0, NULL, 'd'

 			},

 			{

+				"dont-wait", 0, NULL, 'w'

+			},

+			{

 				"debug", 0, NULL, 'D'

 			},

 			{

@@ -755,6 +792,10 @@ main(int argc, char **argv)

 			case 'a':	/* e-mail errors from here */

 				from = optarg;

 				break;

+			case 'A':

+				advisory++;

+				smfilter.xxfi_flags |= SMFIF_CHGHDRS;

+				break;

 			case 'b':	/* bounce worms/viruses */

 				bflag++;

 				break;

@@ -834,6 +875,9 @@ main(int argc, char **argv)

 			case 'V':

 				puts(clamav_version);

 				return EX_OK;

+			case 'w':

+				dont_wait++;

+				break;

 #ifdef	CL_DEBUG

 			case 'x':

 				debug_level = atoi(optarg);

@@ -903,16 +947,24 @@ main(int argc, char **argv)

 		} else

 			fprintf(stderr, "%s: running as root is not recommended\n", argv[0]);

 	}

+	if(advisory && quarantine) {

+		fprintf(stderr, "%s: Advisory mode doesn't work with quarantine mode\n", argv[0]);

+		return EX_USAGE;

+	}

 	if(quarantine_dir) {

 		struct stat statb;

+		if(advisory) {

+			fprintf(stderr, "%s: Advisory mode doesn't work with quarantine directories\n", argv[0]);

+			return EX_USAGE;

+		}

 		if(access(quarantine_dir, W_OK) < 0) {

 			perror(quarantine_dir);

-			return EX_CONFIG;

+			return EX_USAGE;

 		}

 		if(stat(quarantine_dir, &statb) < 0) {

 			perror(quarantine_dir);

-			return EX_CONFIG;

+			return EX_USAGE;

 		}

 		/*

 		 * Quit if the quarantine directory is publically readable

@@ -1409,16 +1461,21 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 #endif

 	char *remoteIP;

+	if(ctx == NULL) {

+		if(use_syslog)

+			syslog(LOG_ERR, "clamfi_connect: ctx is null");

+		return cl_error;

+	}

 	if(hostname == NULL) {

 		if(use_syslog)

 			syslog(LOG_ERR, "clamfi_connect: hostname is null");

 		return cl_error;

 	}

-	if(hostaddr == NULL)

+	if((hostaddr == NULL) || (&(((struct sockaddr_in *)(hostaddr))->sin_addr) == NULL))

 		/*

 		 * According to the sendmail API hostaddr is NULL if

 		 * "the type is not supported in the current version". What

-		 * the documentation doesn't say is the type of what?

+		 * the documentation doesn't say is the type of what.

 		 *

 		 * Possibly the input is not a TCP/IP socket e.g. stdin?

 		 */

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

 	 */

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

 		const char *hostmail;

-		const struct hostent *hp = NULL;

+#ifdef	HAVE_GETHOSTBYNAME_R

+		struct hostent *hp, hostent;

+		char buf[BUFSIZ];

+		int ret;

+#else

+		const struct hostent *hp2, *hp;

+		struct hostent hostent;

+		static pthread_mutex_t hostent_mutex = PTHREAD_MUTEX_INITIALIZER;

+#endif

 		/*

 		 * Using TCP/IP for the sendmail->clamav-milter connection

@@ -1462,14 +1527,28 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 			hostmail = "unknown";

 		}

-		if((hp = gethostbyname(hostmail)) == NULL) {

+#ifdef	HAVE_GETHOSTBYNAME_R

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

 			if(use_syslog)

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

 			return cl_error;

 		}

+#else

+		pthread_mutex_lock(&hostent_mutex);

+		if((hp2 = gethostbyname(hostmail)) == NULL) {

+			pthread_mutex_unlock(&hostent_mutex);

+			if(use_syslog)

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

+			return cl_error;

+		}

+		memcpy(&hostent, hp2, sizeof(struct hostent));

+		pthread_mutex_unlock(&hostent_mutex);

+		hp = &hostent;

+#endif

 #ifdef HAVE_INET_NTOP

-		if(inet_ntop(AF_INET, (struct in_addr *)hp->h_addr, ip, sizeof(ip)) == NULL) {

+		if(hp->h_addr &&

+		   (inet_ntop(AF_INET, (struct in_addr *)hp->h_addr, ip, sizeof(ip)) == NULL)) {

 			perror(hp->h_name);

 			/*if(use_syslog)

 				syslog(LOG_WARNING, "Can't get IP address for (%s)", hp->h_name);

@@ -1479,7 +1558,7 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 			return cl_error;

 		}

 #else

-		strncpy(ip, (char *)inet_ntoa(*(struct in_addr *)hp->h_addr), sizeof(ip) - 1);

+		strncpy(ip, (char *)inet_ntoa(*(struct in_addr *)hp->h_addr), sizeof(ip));

 #endif

 		/*

@@ -1583,6 +1662,14 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 					"hit max-children limit (%u >= %u): waiting for some to exit",

 					n_children, max_children);

+			if(dont_wait) {

+				pthread_mutex_unlock(&n_children_mutex);

+				/*

+				 * TODO: use smfi_setreply to send a useful

+				 * message to the remote SMTP client

+				 */

+				return SMFIS_TEMPFAIL;

+			}

 			/*

 			 * Wait for an amount of time for a child to go (default

 			 * 60 seconds).

@@ -2224,17 +2311,11 @@ clamfi_eom(SMFICTX *ctx)

 					syslog(LOG_DEBUG, "Can't set quarantine user %s", quarantine);

 				else

 					cli_warnmsg("Can't set quarantine user %s\n", quarantine);

-			} else {

-				char subject[128];

-

-				/*

-				 * FIXME: doesn't work if there's no subject

-				 */

-				snprintf(subject, sizeof(subject) - 1,

-					"[Virus] %s", virusname);

-				smfi_chgheader(ctx, "Subject", 1, subject);

-			}

-		} else if(rejectmail) {

+			} else

+				setsubject(ctx, virusname);

+		} else if(advisory)

+			setsubject(ctx, virusname);

+		else if(rejectmail) {

 			if(privdata->discard)

 				rc = SMFIS_DISCARD;

 			else

@@ -2997,3 +3078,18 @@ sendtemplate(SMFICTX *ctx, const char *filename, FILE *sendmail, const char *cla

 	return 0;

 }

+

+/*

+ * Store the name of the virus in the subject of the e-mail

+ */

+static void

+setsubject(SMFICTX *ctx, const char *virusname)

+{

+	char subject[128];

+

+	/*

+	 * FIXME: doesn't work if there's no subject

+	 */

+	snprintf(subject, sizeof(subject) - 1, "[Virus] %s", virusname);

+	smfi_chgheader(ctx, "Subject", 1, subject);

+}

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.8.3 from Makefile.am.

+# Makefile.in generated by automake 1.8.5 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -503,9 +503,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	  done | \

 	  $(AWK) '    { files[$$0] = 1; } \

 	       END { for (i in files) print i; }'`; \

-	test -z "$(ETAGS_ARGS)$$tags$$unique" \

-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

-	     $$tags $$unique

+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

+	  test -n "$$unique" || unique=$$empty_fix; \

+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+	    $$tags $$unique; \

+	fi

 ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.8.3 from Makefile.am.

+# Makefile.in generated by automake 1.8.5 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -425,9 +425,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	  done | \

 	  $(AWK) '    { files[$$0] = 1; } \

 	       END { for (i in files) print i; }'`; \

-	test -z "$(ETAGS_ARGS)$$tags$$unique" \

-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

-	     $$tags $$unique

+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

+	  test -n "$$unique" || unique=$$empty_fix; \

+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+	    $$tags $$unique; \

+	fi

 ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

@@ -95,6 +95,8 @@ int dsstream(int sockd)

 {

 	int wsockd, loopw = 60, bread, port, infected = 0;

 	struct sockaddr_in server;

+	struct sockaddr_in peer;

+	int peer_size;

 	char buff[4096], *pt;

     if(write(sockd, "STREAM", 6) <= 0) {

@@ -129,6 +131,15 @@ int dsstream(int sockd)

     server.sin_family = AF_INET;

     server.sin_port = htons(port);

+    peer_size = sizeof(peer);

+    if(getpeername(sockd, (struct sockaddr *) &peer, &peer_size) < 0) {

+	perror("getpeername()");

+	mprintf("@Can't get socket peer name.\n");

+	return -1;

+    }

+

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

+

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

 	close(wsockd);

 	perror("connect()");

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.8.3 from Makefile.am.

+# Makefile.in generated by automake 1.8.5 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -458,9 +458,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	  done | \

 	  $(AWK) '    { files[$$0] = 1; } \

 	       END { for (i in files) print i; }'`; \

-	test -z "$(ETAGS_ARGS)$$tags$$unique" \

-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

-	     $$tags $$unique

+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

+	  test -n "$$unique" || unique=$$empty_fix; \

+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

+	    $$tags $$unique; \

+	fi

 ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

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

 # Define the identity of the package.

  PACKAGE=clamav

- VERSION="devel-`date +%Y%m%d`"

+ VERSION="0.75"

 cat >>confdefs.h <<_ACEOF

@@ -3290,9 +3290,14 @@ else

        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

       # icc doesn't choke on unknown options, it will just issue warnings

-      # (even with -Werror).  So we grep stderr for any message

-      # that says an option was ignored.

-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else

+      # or remarks (even with -Werror).  So we grep stderr for any message

+      # that says an option was ignored or not supported.

+      # When given -MP, icc 7.0 and 7.1 complain thusly:

+      #   icc: Command line warning: ignoring option '-M'; no argument required

+      # The diagnosis changed in icc 8.0:

+      #   icc: Command line remark: option '-MP' not supported

+      if (grep 'ignoring option' conftest.err ||

+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

         am_cv_CC_dependencies_compiler_type=$depmode

         break

       fi

@@ -5009,7 +5014,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

 case $host in

 *-*-irix6*)

   # Find out which ABI we are using.

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

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

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

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -5582,7 +5587,7 @@ chmod -w .

 save_CFLAGS="$CFLAGS"

 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"

 compiler_c_o=no

-if { (eval echo configure:5585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

+if { (eval echo configure:5590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

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

   # So say no if there are warnings

   if test -s out/conftest.err; then

@@ -7509,7 +7514,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 7512 "configure"

+#line 7517 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -7607,7 +7612,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 7610 "configure"

+#line 7615 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

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

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

+

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

 do

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

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

@@ -17,7 +17,7 @@ dnl   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 AC_INIT(clamscan/clamscan.c)

 AC_CREATE_TARGET_H(target.h)

-AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`")

+AM_INIT_AUTOMAKE(clamav, "0.75")

 AM_CONFIG_HEADER(clamav-config.h)

 LC_CURRENT=1

@@ -42,7 +42,7 @@ AC_TYPE_OFF_T

 AC_COMPILE_CHECK_SIZEOF(short)

 AC_COMPILE_CHECK_SIZEOF(int)

 AC_COMPILE_CHECK_SIZEOF(long)

-AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop setgroups initgroups)

+AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop setgroups initgroups gethostbyname_r)

 AC_FUNC_MMAP

 AC_FUNC_FSEEKO

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.8.3 from Makefile.am.

+# Makefile.in generated by automake 1.8.5 from Makefile.am.

 # @configure_input@