Merge commit 'f4d091fbe1f4' into 4.next

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index bd05c51b53e8074ceb6f3fd02b2dec63b54213be..a099f94b00d61c66e989f2e0a859367e8c2666f2 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -1543,6 +1543,9 @@ if (  pdkim_headcat(&col, hdr, ";", "a=", pdkim_algos[sig->algo])
   if (!pdkim_headcat(&col, hdr, NULL, ";", ""))
     goto BAIL;
   }
+  else 
+    if(!pdkim_headcat(&col, hdr, ";", "b=", ""))
+      goto BAIL;
 
 rc = strdup(hdr->str);
 

diff --git a/test/trusted_configs b/test/trusted_configs
new file mode 100644 (file)
index 0000000..4a5bd0c
--- /dev/null
+++ b/test/trusted_configs
@@ -0,0 +1 @@
+/home/jgh/git/exim/test/test-config