Milter-greylist

Hi,

>>>>> On Wed, 13 Oct 2004 23:46:13 +0200
>>>>> manu@... said:

manu> Following the "release early, release often", I released 1.5.9, we'll
manu> quickly do an 1.5.10 with the other pending patches.

I found two problems.  Here is a patch.

- If AF_INET6 is not defined, it cannot be compiled.  subnetmatch6
  code is not protected by #ifdef AF_INET6.

- The correction in milter-greylist.c is incomplete.  Since the
  failure of iptostring() affects only syslog output, the rest should
  be executed even when iptostring() fails.

Index: conf_yacc.y
diff -u conf_yacc.y.orig conf_yacc.y
--- conf_yacc.y.orig	Tue Oct 12 05:57:42 2004
+++ conf_yacc.y	Thu Oct 14 15:23:54 2004
@@ -203,9 +203,15 @@
 					prefix2mask4($2, &conf.c_match_mask);
 				}
 	;	
-subnetmatch6:	SUBNETMATCH6 CIDR{ if (C_NOTFORCED(C_MATCHMASK6))
-					prefix2mask6($2, &conf.c_match_mask6);
-				}
+subnetmatch6:	SUBNETMATCH6 CIDR{
+#ifdef AF_INET6
+			if (C_NOTFORCED(C_MATCHMASK6))
+				prefix2mask6($2, &conf.c_match_mask6);
+#else
+			printf("IPv6 is not supported, ignore line %d\n",
+			    conf_line);
+#endif
+		}
 	;
 socket:		SOCKET PATH	{ if (C_NOTFORCED(C_SOCKET)) 
 					conf.c_socket = 
Index: milter-greylist.c
diff -u -p milter-greylist.c.orig milter-greylist.c
--- milter-greylist.c.orig	Wed Oct  6 15:31:51 2004
+++ milter-greylist.c	Thu Oct 14 15:19:43 2004
@@ -276,11 +276,11 @@ mlfi_envfrom(ctx, envfrom)
 			syslog(LOG_DEBUG, 
 			    "Sender IP %s and address %s are SPF-compliant, "
 			    "bypassing greylist", ipstr, *envfrom);
-			priv->priv_elapsed = 0;
-			priv->priv_whitelist = EXF_SPF;
-
-			return SMFIS_CONTINUE;
 		}
+		priv->priv_elapsed = 0;
+		priv->priv_whitelist = EXF_SPF;
+
+		return SMFIS_CONTINUE;
 	}
 
 	return SMFIS_CONTINUE;


Sincerely,

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