On Wed, 7 Jan 2009, Scott Kitterman wrote:
This affects two Ubuntu versions that are post-release and I'll have to
patch if I am to fix them, so a patch would be handy. It's 2.5.4 and
2.6.0 if it matters.
Diffs to those two versions attached. They're identical except for the
line numbers and version numbers.Index: dkim-filter/dkim-filter.c
===================================================================
RCS file: /cvs/dkim-filter/dkim-filter.c,v
retrieving revision 1.360
diff -u -r1.360 dkim-filter.c
--- dkim-filter/dkim-filter.c 15 Apr 2008 20:42:29 -0000 1.360
+++ dkim-filter/dkim-filter.c 7 Jan 2009 20:56:14 -0000
@@ -975,9 +975,6 @@
char *v;
char *tmp;
- /* load defaults */
- memcpy(&conf->conf_handling, &defaults, sizeof conf->conf_handling);
-
if (confstr == NULL)
return TRUE;
@@ -1128,6 +1125,9 @@
new->conf_signbytes = -1L;
new->conf_sigmintype = SIGMIN_BYTES;
+ /* load defaults */
+ memcpy(&conf->conf_handling, &defaults, sizeof conf->conf_handling);
+
return new;
}
Index: libdkim/dkim.c
===================================================================
RCS file: /cvs/libdkim/dkim.c,v
retrieving revision 1.469
diff -u -r1.469 dkim.c
--- libdkim/dkim.c 14 Apr 2008 20:02:58 -0000 1.469
+++ libdkim/dkim.c 7 Jan 2009 20:56:14 -0000
@@ -2723,6 +2723,7 @@
{
dkim_error(dkim, "required header \"%s\" not found",
required_signhdrs[c]);
+ dkim->dkim_state = DKIM_STATE_UNUSABLE;
return DKIM_STAT_SYNTAX;
}
}
Index: dkim-filter/dkim-filter.c
===================================================================
RCS file: /cvs/dkim-filter/dkim-filter.c,v
retrieving revision 1.385
diff -u -r1.385 dkim-filter.c
--- dkim-filter/dkim-filter.c 5 Jun 2008 15:12:44 -0000 1.385
+++ dkim-filter/dkim-filter.c 7 Jan 2009 20:55:47 -0000
@@ -1130,9 +1130,6 @@
char *v;
char *tmp;
- /* load defaults */
- memcpy(&conf->conf_handling, &defaults, sizeof conf->conf_handling);
-
if (confstr == NULL)
return TRUE;
@@ -1278,6 +1275,9 @@
new->conf_signbytes = -1L;
new->conf_sigmintype = SIGMIN_BYTES;
+ /* load defaults */
+ memcpy(&conf->conf_handling, &defaults, sizeof conf->conf_handling);
+
return new;
}
Index: libdkim/dkim.c
===================================================================
RCS file: /cvs/libdkim/dkim.c,v
retrieving revision 1.485
diff -u -r1.485 dkim.c
--- libdkim/dkim.c 5 Jun 2008 23:32:41 -0000 1.485
+++ libdkim/dkim.c 7 Jan 2009 20:55:47 -0000
@@ -2776,6 +2776,7 @@
{
dkim_error(dkim, "required header \"%s\" not found",
required_signhdrs[c]);
+ dkim->dkim_state = DKIM_STATE_UNUSABLE;
return DKIM_STAT_SYNTAX;
}
}
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
dkim-milter-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dkim-milter-discuss
