X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6372d4c990f39ba6ad84a91af0a3a61a63bd50a3..2c3ac6dd18dbf1f048a7054a85879dbf90c1e7f4:/test/scripts/4650-DMARC/4650?ds=inline

diff --git a/test/scripts/4650-DMARC/4650 b/test/scripts/4650-DMARC/4650
index 85d9e51cc..04e5d0ae7 100644
--- a/test/scripts/4650-DMARC/4650
+++ b/test/scripts/4650-DMARC/4650
@@ -1,32 +1,62 @@
 # acl variables and authresults
 #
-# SPF is a problem.  We use libspf2 to do the work, and it
-# does the DNS lookups, so we cannot intercept them in the testsuite's usual fashion
-# to provide values for testcases.
-#
 # For now just check that what should be working syntax does not cause us to fall over.
-# Be careful with envelope-domains used for testcases, as real DNS lookups will be done.
+#
+# SPF and DMARC lookups in DNS are diverted into the testsuite fakedns handling.
+# Be careful with envelope-domains used for testcases, as real DNS lookups will be done
+# for names not provided for in fakedns.
+#
+mkdir DIR/tmp
+sudo chmod 777 DIR/tmp
 #
 exim -bd -DSERVER=server -oX PORT_D
 ****
+#
+#
+# Without a dkim signing, then with (copied from 4500)
 client HOSTIPV4 PORT_D
 ??? 220
 HELO testclient
 ??? 250
-MAIL FROM:<a@example.com>
+MAIL FROM:<a@test.ex>
 ??? 250
 RCPT TO:<fred@test.ex>
 ??? 250
 DATA
-??? 3
+??? 354
 Subject: test
-From: z@example.com
+From: <z@test.ex>
 
 body line
 .
 ??? 250
+RSET
+??? 250
+MAIL FROM:<CALLER@bloggs.com>
+??? 250
+RCPT TO:<a@test.ex>
+??? 250
+DATA
+??? 354
+DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=test.ex; h=from:to
+	:date:message-id:subject; s=sel; bh=OB9dZVu7+5/ufs3TH9leIcEpXSo=; b=
+	CoaRNB2Z59hSnhTzT8bYbMIN3P57XAVcFeV5oGEl4aKmhm6Mtu2uIc7B2z9k5+A/
+	+KFIE9HRj7eg9kPzagoPIvI84WE5PN5yRehMjJI6WqhM3V+bQDHkb8ubSmiaYxY5
+	B2Pd/kEGgHUlMDB0Hug4FMMt7GcFxagKspthOT/Pso0=
+From: mrgus@test.ex
+To: bakawolf@yahoo.com
+Date: Thu, 19 Nov 2015 17:00:07 -0700
+Message-ID: <qwerty1234@disco-zombie.net>
+Subject: simple test
+
+This is a simple test.
+.
+??? 250
 QUIT
 ****
 #
 killdaemon
+cat DIR/tmp/TESTNUM.hist.dmarc
+#
+sudo rm -fr DIR/tmp
 no_msglog_check