@@ -1,3 +1,10 @@

+Thu Jul  8 23:23:34 BST 2004 (njh)

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

+  * clamav-milter:	Validate arguments given to inet_ntop. This

+		is needed for machines that can't always get hostnames

+		right, presumably broken hosts file or DNS or possibly

+		connecting to sendmail incorrectly

+

 Thu Jul  8 19:12:14 CEST 2004 (tk)

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

   * libclamav: read .db3 files from cvd

@@ -86,6 +86,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 +420,7 @@ 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

 BUG REPORTS

@@ -26,6 +26,9 @@

  *

  * Change History:

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

+ * 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 +320,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.103 2004/07/08 22:22:39 nigelhorne Exp $";

-#define	CM_VERSION	"0.74a"

+#define	CM_VERSION	"0.74b"

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

@@ -1414,7 +1417,7 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 			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

@@ -1469,7 +1472,8 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 		}

 #ifdef HAVE_INET_NTOP

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

+		if(hp && 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);