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.28.16;	author rse;	state Exp;
branches;
next	1.1;
commitid	THPRV5X7VyHkPu8s;

1.1
date	2006.12.30.12.43.45;	author rse;	state Exp;
branches;
next	;
commitid	TT3J8XdLeLVWTx0s;


desc
@@


1.2
log
@unbreak under runtime (version mismatch) by including the OpenPKG (and not the system) MILTER API
@
text
@Index: dk-filter/dk-filter.c
--- dk-filter/dk-filter.c.orig	2006-05-19 23:42:05 +0200
+++ dk-filter/dk-filter.c	2007-03-02 10:26:32 +0100
@@@@ -61,7 +61,7 @@@@
 
 /* libmilter includes */
 #ifndef DEBUG
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 #endif /* !DEBUG */
 
 /* libdk includes */
@@@@ -2076,6 +2076,13 @@@@
 	dfc = cc->cctx_msg;
 	assert(dfc != NULL);
 
+	/* Determine the job ID for logging. */
+	if (dfc->mctx_jobid == 0 || strcmp(dfc->mctx_jobid, JOBIDUNKNOWN) == 0) {
+		char *jobid = smfi_getsymval(ctx, "i");
+		if (jobid != 0)
+			dfc->mctx_jobid = jobid;
+	}
+
 	/* get hostname; used in the X header and in new MIME boundaries */
 	hostname = smfi_getsymval(ctx, "j");
 	if (hostname == NULL)
@


1.1
log
@apply the MILTER workaround for Postfix as mentioned on the Postfix website
@
text
@d3 10
a12 1
+++ dk-filter/dk-filter.c	2006-12-30 13:41:07 +0100
@