Milter-greylist

Hi,

>>>>> On Sun, 8 Jan 2006 01:55:48 +0100
>>>>> manu@... said:

manu> http://ftp.espci.fr/pub/milter-greylist/milter-greylist-2.1.1.tgz
manu> MD5 (milter-greylist-2.1.1.tgz) = 0fc36be78526a507d6a911a7c5955b58

manu> And if you get burned, please complain.

There is merge failure.  Please apply following patch:

Index: milter-greylist.c
diff -u -p milter-greylist.c.orig milter-greylist.c
--- milter-greylist.c.orig	Sun Jan  8 09:04:37 2006
+++ milter-greylist.c	Sun Jan  8 13:00:02 2006
@@ -167,7 +167,7 @@ mlfi_helo(ctx, helostr)
 	priv = (struct mlfi_priv *) smfi_getpriv(ctx);
 
 #if (defined(HAVE_SPF) || defined(HAVE_SPF_ALT) || \
-     defined(HAVE_SPF2) || defined(HAVE_SPF2)) 
+     defined(HAVE_SPF2_10) || defined(HAVE_SPF2))
 	strncpy_rmsp(priv->priv_helo, helostr, ADDRLEN);
 	priv->priv_helo[ADDRLEN] = '\0';
 #endif


Sincerely,

--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@...  ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/