Attachment 100064 Details for Bug 139306 – patch_mail_spamd.txt

patch_mail_spamd.txt

patch_mail_spamd.txt (text/plain), 1.04 KB, created by Olli Hauer on 2009-10-02 10:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2009-10-02 10:20:02 UTC

Size: 1.04 KB

patch

obsolete

>--- Makefile
>+++ Makefile
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	spamd
> PORTVERSION=	4.5.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail
> MASTER_SITES=	BERLIOS
> MASTER_SITE_SUBDIR=freebsdspamd
>--- /dev/null
>+++ files/patch-spamd__grey.c
>@@ -0,0 +1,29 @@
>+--- ./spamd/grey.c.orig
>++++ ./spamd/grey.c
>+@@ -329,9 +329,10 @@
>+ {
>+ 	ipfw_table_entry ent;
>+ 	int i;
>+-	static int ipfw_socket;
>++	static int ipfw_socket = 0;
>+ 	
>+-	ipfw_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
>++	if (ipfw_socket == 0)
>++		ipfw_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
>+ 
>+ 	if (debug)
>+ 		fprintf(stderr, "configure ipfw tabno: %d\n", ipfw_tabno);
>+@@ -363,8 +364,11 @@
>+ 		inet_aton(addrs[i], (struct in_addr *)&ent.addr);
>+ 		if (setsockopt(ipfw_socket, IPPROTO_IP, IP_FW_TABLE_ADD,  &ent, sizeof(ent)) < 0)
>+ 		{
>+-			syslog_r(LOG_INFO, &sdata, "IPFW setsockopt(IP_FW_TABLE_ADD) (%m)");
>+-			return(-1);
>++			/* work around dups */
>++			if (errno != EEXIST) {
>++				syslog_r(LOG_INFO, &sdata, "IPFW setsockopt(IP_FW_TABLE_ADD) (%m)");
>++				return(-1);
>++			}
>+ 		}
>+ 	}
>+

Actions: View

Attachments on bug 139306: 100064