Bug#993880: exim4-config: additional dkim macro for dkim_identity

[Richard Lewis]

Package: exim4-config
Version: 4.94.2-7
Severity: normal
Tags: patch

Dear Maintainer,

In the file 
  /etc/exim4/conf.d/transport/30_exim4-config_remote-smtp
there are various macros around various dkim
settings.

But there is nothing for dkim_identity (which
sets the 'i=....', see eg https://exim.org/exim-html-4.91/doc/html/spec_html/ch-dkim_and_spf.html
this has been available since at least buster)

The attached patch adds such a macro.

(Apologies if this is not the way to submit such a patch)



Thanks for considering applying this




-- System Information:
Debian Release: 11.0
  APT prefers stable-security
  APT policy: (500, 'stable-security'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/1 CPU thread)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages exim4-config depends on:
ii  adduser                3.118
ii  debconf [debconf-2.0]  1.5.77

Versions of packages exim4-config recommends:
ii  ca-certificates  20210119

exim4-config suggests no packages.

-- Configuration Files:
/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt changed [not included]
/etc/exim4/conf.d/acl/40_exim4-config_check_data changed [not included]
/etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs changed [not included]
/etc/exim4/conf.d/transport/30_exim4-config_remote_smtp changed [not included]
/etc/exim4/exim4.conf.template changed [not included]
/etc/exim4/passwd.client [Errno 13] Permission denied: '/etc/exim4/passwd.client'

-- debconf information excluded
-------------- next part --------------
--- etc__exim4__conf.d__transport__30_exim4-config_remote-smtp.orig	2021-09-05 23:13:30.119197133 +0100
+++ etc__exim4__conf.d__transport__30_exim4-config_remote-smtp.new	2021-09-05 23:17:30.522924605 +0100
@@ -24,3 +24,3 @@
 .ifdef REMOTE_SMTP_HELO_DATA
   helo_data=REMOTE_SMTP_HELO_DATA
 .endif
.ifdef REMOTE_SMTP_INTERFACE
  interface = REMOTE_SMTP_INTERFACE
.endif
 .ifdef DKIM_DOMAIN
 dkim_domain = DKIM_DOMAIN
 .endif
+.ifdef DKIM_IDENTITY
+dkim_identity = DKIM_IDENTITY
+.endif
 .ifdef DKIM_SELECTOR
 dkim_selector = DKIM_SELECTOR
 .endif