@@ -1,3 +1,7 @@

+Thu Mar 29 11:05:56 BST 2007 (njh)

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

+  * clamav-milter.c:	Incorrectly formatted local IPs were being ignored

+

 Thu Mar 29 00:13:14 CEST 2007 (tk)

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

   * docs/signatures.pdf: update

@@ -9,7 +13,7 @@ Wed Mar 28 21:45:12 CEST 2007 (tk)

 Tue Mar 27 22:05:28 BST 2007 (njh)

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

   * clamav-milter.c:	Added IPv6 support, based on a patch by

-  				Jacek Zapala <jacek@it.pl>, which also adds

+				Jacek Zapala <jacek@it.pl>, which also adds

 				more --ignore addresses.

 			Also bug 423

@@ -3913,12 +3913,12 @@ clamfi_send(struct privdata *privdata, size_t len, const char *format, ...)

 				perror(privdata->filename);

 				strerror_r(errno, buf, sizeof(buf));

-				logg(_("!write failure (%u bytes) to %s: %s\n"),

-					len, privdata->filename, buf);

+				logg(_("!write failure (%lu bytes) to %s: %s\n"),

+					(unsigned long)len, privdata->filename, buf);

 #else

 				perror(privdata->filename);

-				logg(_("!write failure (%u bytes) to %s: %s\n"),

-					len, privdata->filename,

+				logg(_("!write failure (%lu bytes) to %s: %s\n"),

+					(unsigned long)len, privdata->filename,

 					strerror(errno));

 #endif

 			} else {

@@ -3929,12 +3929,12 @@ clamfi_send(struct privdata *privdata, size_t len, const char *format, ...)

 				{

 					char buf[32];

 					strerror_r(errno, buf, sizeof(buf));

-					logg(_("!write failure (%u bytes) to clamd: %s\n"),

-						len, buf);

+					logg(_("!write failure (%lu bytes) to clamd: %s\n"),

+						(unsigned long)len, buf);

 				}

 #else

-				logg(_("!write failure (%u bytes) to clamd: %s\n"),

-					len, strerror(errno));

+				logg(_("!write failure (%lu bytes) to clamd: %s\n"),

+					(unsigned long)len, strerror(errno));

 #endif

 				checkClamd();

 			}

@@ -4901,6 +4901,9 @@ add_local_ip(char *address)

 	}

 #endif

 #endif

+	else

+		retval = 0;

+

 	free (opt);

 	return retval;

 }