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


1.4
date	2008.01.26.07.51.30;	author cs;	state Exp;
branches;
next	1.3;
commitid	isACiOEq0BltGTOs;

1.3
date	2007.10.07.08.18.15;	author cs;	state Exp;
branches;
next	1.2;
commitid	CENJVOXI2eZQoDAs;

1.2
date	2007.03.02.09.26.39;	author rse;	state Exp;
branches;
next	1.1;
commitid	jJYVHuFVUzMLOu8s;

1.1
date	2006.12.30.22.16.51;	author rse;	state Exp;
branches;
next	;
commitid	5mkIFOpqOnYy4B0s;


desc
@@


1.4
log
@upgrading package: milter-dkim 2.4.3 -> 2.4.4
@
text
@Index: dkim-filter/dkim-filter.c
--- dkim-filter/dkim-filter.c.orig	2007-10-05 23:14:21 +0200
+++ dkim-filter/dkim-filter.c	2007-10-07 10:14:13 +0200
@@@@ -56,7 +56,7 @@@@
 #include <sm/string.h>
 
 /* libmilter includes */
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 
 /* libdkim includes */
 #include <dkim.h>
@@@@ -2879,6 +2879,13 @@@@
 		}
 	}
 
+	/* 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 = dkimf_getsymval(ctx, "j");
 	if (hostname == NULL)
Index: dkim-filter/dkim-filter.h
--- dkim-filter/dkim-filter.h.orig	2008-01-25 19:45:56.000000000 +0100
+++ dkim-filter/dkim-filter.h	2008-01-26 08:46:45.000000000 +0100
@@@@ -19,7 +19,7 @@@@
 #include <sm/gen.h>
 
 /* libmilter */
-#include <libmilter/mfapi.h>
+#include <milter/mfapi.h>
 
 /* libdkim */
 #include <dkim.h>
Index: dkim-filter/test.h
--- dkim-filter/test.h.orig	2007-10-03 03:02:33.000000000 +0200
+++ dkim-filter/test.h	2008-01-26 08:47:19.000000000 +0100
@@@@ -21,7 +21,7 @@@@
 #include <sm/cdefs.h>
 
 /* libmilter includes */
-#include <libmilter/mfapi.h>
+#include <milter/mfapi.h>
 
 /* libdkim includes */
 #include "dkim.h"
@


1.3
log
@upgrading package: milter-dkim 2.2.1 -> 2.3.0
@
text
@d27 24
@


1.2
log
@unbreak under runtime (version mismatch) by including the OpenPKG (and not the system) MILTER API
@
text
@d2 4
a5 3
--- dkim-filter/dkim-filter.c.orig	2007-03-01 22:16:43 +0100
+++ dkim-filter/dkim-filter.c	2007-03-02 10:24:31 +0100
@@@@ -62,7 +62,7 @@@@
a7 1
 #ifndef DEBUG
a9 1
 #endif /* !DEBUG */
d12 2
a13 1
@@@@ -2407,6 +2407,13 @@@@
d25 1
a25 1
 	hostname = smfi_getsymval(ctx, "j");
@


1.1
log
@ops, add missing files to CVS, too
@
text
@d2 12
a13 3
--- dkim-filter/dkim-filter.c.orig	2006-09-12 23:46:30 +0200
+++ dkim-filter/dkim-filter.c	2006-12-30 22:15:17 +0100
@@@@ -2308,6 +2308,13 @@@@
@