DKIM: permit dkim_private_key to override dkim_strict on signing. Bug 2220

[exim.git] / test / scripts / 4500-DKIM / 4520

diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520
index 6efe3545aa7a614a6ac1b29a35e7620c81a58948..406db39a5c00b3324baa87e045ffbb850bb479a6 100644 (file)
--- a/test/scripts/4500-DKIM/4520
+++ b/test/scripts/4500-DKIM/4520
@@ -15,6 +15,39 @@ content
 exim -DOPT=From:From -odf b@test.ex
 From: nobody@example.com
 
 exim -DOPT=From:From -odf b@test.ex
 From: nobody@example.com
 

+content
+****
+#
+# no header, multi-sign
+exim -DOPT=From:=X-Mine -odf b10@test.ex
+From: nobody@example.com
+
+content
+****
+#
+# double header, multi-sign
+exim -DOPT=From:=X-Mine -odf b12@test.ex
+From: nobody@example.com
+X-mine: one
+X-mine: two
+
+content
+****
+#
+#
+# no header, always-oversign
+exim -DOPT=+X-Mine -odf b20@test.ex
+From: nobody@example.com
+
+content
+****
+#
+# double header, always-oversign
+exim -DOPT=+X-Mine -odf b22@test.ex
+From: nobody@example.com
+X-mine: one
+X-mine: two
+

 content
 ****
 #
 content
 ****
 #


@@ -26,7 +59,14 @@ content
 ****
 #
 # check that on signing we warn in debug mode about verify problems
 ****
 #
 # check that on signing we warn in debug mode about verify problems

-exim -d-all+acl -DHEADERS_MAXSIZE=y -DSELECTOR=sel_bad -odf d@test.ex
+exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex
+From: nobody@example.com
+
+content
+****
+#
+# check that an empty dkim_privatekey overrides dkim_strict
+exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf a@test.ex

 From: nobody@example.com
 
 content
 From: nobody@example.com
 
 content