From 9e70917d0aa5e51f584b2af69ce80df458ac5c79 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 12 Sep 2017 17:49:58 +0100
Subject: DKIM: support multiple signing, by selector

---
 test/confs/4520 | 7 ++++++-
 test/confs/4524 | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 120000 test/confs/4524

(limited to 'test/confs')

diff --git a/test/confs/4520 b/test/confs/4520
index 449702855..5f4649846 100644
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -12,6 +12,7 @@ primary_hostname = myhost.test.ex
 acl_smtp_rcpt = accept
 acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
 
+DDIR=DIR/aux-fixed/dkim
 
 # ----- Routers
 
@@ -42,7 +43,11 @@ send_to_server:
 .else
   dkim_selector =	sel
 .endif
-  dkim_private_key =	DIR/aux-fixed/dkim/dkim.private
+
+  dkim_private_key =	${if match {$dkim_selector}{^ses}	{DDIR/dkim512.private} \
+			  {${if match {$dkim_selector}{^sel} {DDIR/dkim.private} \
+			  {}}}}
+
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =	OPT
 .endif
diff --git a/test/confs/4524 b/test/confs/4524
new file mode 120000
index 000000000..072f5faf2
--- /dev/null
+++ b/test/confs/4524
@@ -0,0 +1 @@
+4520
\ No newline at end of file
-- 
cgit v1.2.3