@@ -1,3 +1,9 @@

+Wed Jul 21 18:46:36 BST 2004 (njh)

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

+  * clamav-milter:	Add a note about using sendmail -d0 to see if

+	sendmail has been built with MILTER support

+		Add sanity check to clamfi_connect()

+

 Wed Jul 21 16:47:06 BST 2004 (trog)

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

   * libclamav/chmunpack.c: use fclose() to flush data

@@ -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:

@@ -423,6 +434,7 @@ Changes

 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

 BUG REPORTS

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

  *

  * Change History:

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

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

  *

@@ -323,9 +326,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.104 2004/07/14 10:17:05 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.105 2004/07/21 17:46:06 nigelhorne Exp $";

-#define	CM_VERSION	"0.74c"

+#define	CM_VERSION	"0.74d"

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

@@ -1449,6 +1452,11 @@ 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");

@@ -1458,7 +1466,7 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 		/*

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

 		 */

@@ -1520,7 +1528,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

 		/*