head	1.2;
access;
symbols
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_HEAD:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.03.02.09.36.37;	author rse;	state Exp;
branches;
next	1.1;
commitid	GE7bjeXPOOGbSu8s;

1.1
date	2006.12.30.12.50.01;	author rse;	state Exp;
branches;
next	;
commitid	WIE4E0hhZL76Wx0s;


desc
@@


1.2
log
@unbreak under runtime (version mismatch) by including the OpenPKG (and not the system) MILTER API
@
text
@Index: sid-filter/sid-filter.c
--- sid-filter/sid-filter.c.orig	2006-07-21 00:28:09 +0200
+++ sid-filter/sid-filter.c	2007-03-02 10:35:06 +0100
@@@@ -57,7 +57,7 @@@@
 
 /* libmilter includes */
 #ifndef DEBUG
-# include <libmilter/mfapi.h>
+# include "milter/mfapi.h"
 #endif /* !DEBUG */
 
 /* libmarid includes */
@@@@ -1949,6 +1949,12 @@@@
 	assert(ctx != NULL);
 #endif /* !DEBUG */
 
+	/* execute deferred code from EOH hander
+	   to circumvent Postfix MILTER restriction
+	   (the macro "i" is not available earlier) */
+	if ((ret = mlfi_eoh(ctx)) != SMFIS_CONTINUE)
+		return ret;
+
 	memset(stathdr, '\0', sizeof stathdr);
 	memset(spf_errmsg, '\0', sizeof spf_errmsg);
 	memset(sid_errmsg, '\0', sizeof sid_errmsg);
@@@@ -2392,7 +2398,7 @@@@
 	mlfi_envfrom,	/* envelope sender filter */
 	NULL,		/* envelope recipient filter */
 	mlfi_header,	/* header filter */
-	mlfi_eoh,	/* end of header */
+	NULL,		/* end of header */
 	NULL,		/* body block filter */
 	mlfi_eom,	/* end of message */
 	NULL,		/* message aborted */
@


1.1
log
@apply another Postfix MILTER restriction workaround (doesn't harm other MTAs)
@
text
@d3 10
a12 1
+++ sid-filter/sid-filter.c	2006-12-30 13:48:35 +0100
@