summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-04-23 18:28:09 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2022-04-23 18:28:29 +0100
commit9f6b3bf5187562bac4c96e3ed6a17740d01489fa (patch)
treef9e07d2f4daf2a8fb5ae3874d5a98fcb6b053fea
parentce41ebd827abe9be836bb7f39ebe945867628c34 (diff)
Copyright updates:exim-4.96-RC0
vi $(git log --name-status exim-4.95..master | awk '/^M/{print $2}' | grep -v '^test/' | sort -u)
-rw-r--r--doc/doc-docbook/filter.xfpt2
-rw-r--r--doc/doc-docbook/spec.xfpt2
-rw-r--r--src/Makefile1
-rw-r--r--src/OS/Makefile-Base2
-rw-r--r--src/OS/unsupported/os.c-IRIX1
-rw-r--r--src/OS/unsupported/os.c-IRIX61
-rw-r--r--src/OS/unsupported/os.c-IRIX6321
-rw-r--r--src/OS/unsupported/os.c-IRIX651
-rw-r--r--src/exim_monitor/em_TextPop.c1
-rw-r--r--src/exim_monitor/em_hdr.h2
-rw-r--r--src/exim_monitor/em_log.c2
-rw-r--r--src/exim_monitor/em_main.c2
-rw-r--r--src/exim_monitor/em_queue.c2
-rwxr-xr-xsrc/scripts/MakeLinks2
-rwxr-xr-xsrc/scripts/lookups-Makefile2
-rw-r--r--src/src/acl.c2
-rw-r--r--src/src/arc.c2
-rw-r--r--src/src/auths/auth-spa.c2
-rw-r--r--src/src/auths/call_radius.c2
-rw-r--r--src/src/auths/cyrus_sasl.c2
-rw-r--r--src/src/auths/cyrus_sasl.h1
-rw-r--r--src/src/auths/dovecot.c2
-rw-r--r--src/src/auths/gsasl_exim.c2
-rw-r--r--src/src/auths/gsasl_exim.h2
-rw-r--r--src/src/auths/heimdal_gssapi.c2
-rw-r--r--src/src/auths/heimdal_gssapi.h1
-rw-r--r--src/src/auths/pwcheck.c1
-rw-r--r--src/src/auths/xtextdecode.c1
-rw-r--r--src/src/auths/xtextencode.c1
-rw-r--r--src/src/base64.c2
-rw-r--r--src/src/bmi_spam.c1
-rw-r--r--src/src/buildconfig.c1
-rw-r--r--src/src/child.c2
-rw-r--r--src/src/config.h.defaults2
-rw-r--r--src/src/daemon.c2
-rw-r--r--src/src/dbfn.c2
-rw-r--r--src/src/dbfunctions.h1
-rw-r--r--src/src/debug.c2
-rw-r--r--src/src/deliver.c2
-rw-r--r--src/src/directory.c2
-rw-r--r--src/src/dkim.c2
-rw-r--r--src/src/dkim_transport.c1
-rw-r--r--src/src/dmarc.c2
-rw-r--r--src/src/dmarc.h2
-rw-r--r--src/src/dns.c2
-rw-r--r--src/src/dnsbl.c2
-rw-r--r--src/src/drtables.c2
-rw-r--r--src/src/exim.c2
-rw-r--r--src/src/exim.h1
-rw-r--r--src/src/exim_dbmbuild.c2
-rw-r--r--src/src/exim_dbutil.c2
-rw-r--r--src/src/exiqgrep.src2
-rw-r--r--src/src/expand.c2
-rw-r--r--src/src/filter.c2
-rw-r--r--src/src/filtertest.c2
-rw-r--r--src/src/functions.h2
-rw-r--r--src/src/globals.c4
-rw-r--r--src/src/globals.h2
-rw-r--r--src/src/hash.c2
-rw-r--r--src/src/hash.h3
-rw-r--r--src/src/header.c2
-rw-r--r--src/src/hintsdb.h2
-rw-r--r--src/src/host.c2
-rw-r--r--src/src/local_scan.h2
-rw-r--r--src/src/log.c2
-rw-r--r--src/src/lookupapi.h2
-rw-r--r--src/src/lookups/cdb.c2
-rw-r--r--src/src/lookups/dbmdb.c2
-rw-r--r--src/src/lookups/dnsdb.c2
-rw-r--r--src/src/lookups/dsearch.c2
-rw-r--r--src/src/lookups/ibase.c2
-rw-r--r--src/src/lookups/json.c4
-rw-r--r--src/src/lookups/ldap.c2
-rw-r--r--src/src/lookups/lf_sqlperform.c2
-rw-r--r--src/src/lookups/lmdb.c2
-rw-r--r--src/src/lookups/lsearch.c2
-rw-r--r--src/src/lookups/mysql.c2
-rw-r--r--src/src/lookups/nis.c2
-rw-r--r--src/src/lookups/nisplus.c2
-rw-r--r--src/src/lookups/oracle.c2
-rw-r--r--src/src/lookups/passwd.c2
-rw-r--r--src/src/lookups/pgsql.c2
-rw-r--r--src/src/lookups/readsock.c2
-rw-r--r--src/src/lookups/redis.c2
-rw-r--r--src/src/lookups/spf.c3
-rw-r--r--src/src/lookups/sqlite.c2
-rw-r--r--src/src/lookups/testdb.c2
-rw-r--r--src/src/lookups/whoson.c2
-rw-r--r--src/src/macro_predef.c2
-rw-r--r--src/src/macros.h2
-rw-r--r--src/src/malware.c5
-rw-r--r--src/src/match.c2
-rw-r--r--src/src/mime.c5
-rw-r--r--src/src/moan.c2
-rw-r--r--src/src/mytypes.h2
-rw-r--r--src/src/os.c2
-rw-r--r--src/src/parse.c2
-rw-r--r--src/src/pdkim/pdkim.c2
-rw-r--r--src/src/pdkim/signing.c3
-rw-r--r--src/src/perl.c2
-rw-r--r--src/src/queue.c2
-rw-r--r--src/src/rda.c2
-rw-r--r--src/src/readconf.c2
-rw-r--r--src/src/receive.c2
-rw-r--r--src/src/regex.c5
-rw-r--r--src/src/retry.c2
-rw-r--r--src/src/rewrite.c2
-rw-r--r--src/src/rfc2047.c2
-rw-r--r--src/src/route.c2
-rw-r--r--src/src/routers/dnslookup.c2
-rw-r--r--src/src/routers/ipliteral.c2
-rw-r--r--src/src/routers/iplookup.c2
-rw-r--r--src/src/routers/manualroute.c2
-rw-r--r--src/src/routers/queryprogram.c2
-rw-r--r--src/src/routers/redirect.c2
-rw-r--r--src/src/routers/redirect.h2
-rw-r--r--src/src/routers/rf_change_domain.c1
-rw-r--r--src/src/routers/rf_get_munge_headers.c1
-rw-r--r--src/src/routers/rf_get_transport.c2
-rw-r--r--src/src/search.c2
-rw-r--r--src/src/sieve.c5
-rw-r--r--src/src/smtp_in.c2
-rw-r--r--src/src/smtp_out.c2
-rw-r--r--src/src/spam.c5
-rw-r--r--src/src/spf.c2
-rw-r--r--src/src/spf.h2
-rw-r--r--src/src/spool_in.c2
-rw-r--r--src/src/spool_out.c2
-rw-r--r--src/src/store.c2
-rw-r--r--src/src/store.h2
-rw-r--r--src/src/string.c2
-rw-r--r--src/src/structs.h2
-rw-r--r--src/src/tls-gnu.c2
-rw-r--r--src/src/tls-openssl.c2
-rw-r--r--src/src/tls.c2
-rw-r--r--src/src/tlscert-gnu.c2
-rw-r--r--src/src/tlscert-openssl.c1
-rw-r--r--src/src/transport.c2
-rw-r--r--src/src/transports/appendfile.c2
-rw-r--r--src/src/transports/autoreply.c2
-rw-r--r--src/src/transports/lmtp.c2
-rw-r--r--src/src/transports/pipe.c2
-rw-r--r--src/src/transports/smtp.c2
-rw-r--r--src/src/transports/smtp.h2
-rw-r--r--src/src/transports/smtp_socks.c2
-rw-r--r--src/src/tree.c2
-rw-r--r--src/src/utf8.c1
-rw-r--r--src/src/verify.c2
148 files changed, 162 insertions, 136 deletions
diff --git a/doc/doc-docbook/filter.xfpt b/doc/doc-docbook/filter.xfpt
index 84e7d4a43..740b7470a 100644
--- a/doc/doc-docbook/filter.xfpt
+++ b/doc/doc-docbook/filter.xfpt
@@ -48,7 +48,7 @@
. Copyright year. Update this (only) when changing content.
.macro copyyear
-2018
+2021
.endmacro
. ===========================================================================
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 9f10d1730..1d8868c34 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -54,7 +54,7 @@
.set drivernamemax "64"
.macro copyyear
-2021
+2022
.endmacro
. /////////////////////////////////////////////////////////////////////////////
diff --git a/src/Makefile b/src/Makefile
index a48938023..b774b43dd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,6 +2,7 @@
# appropriate links, and then creating and running the main makefile in that
# directory.
+# Copyright (c) The Exim Maintainers 2022
# Copyright (c) University of Cambridge, 1995 - 2018
# See the file NOTICE for conditions of use and distribution.
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index cab56cc38..78f5516a7 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -5,7 +5,7 @@
# optional, Local/* files at the front of this file, to create Makefile in the
# build directory.
#
-# Copyright (c) The Exim Maintainers 1995 - 2021
+# Copyright (c) The Exim Maintainers 1995 - 2022
SHELL = $(MAKE_SHELL)
SCRIPTS = ../scripts
diff --git a/src/OS/unsupported/os.c-IRIX b/src/OS/unsupported/os.c-IRIX
index d7a8b4f7a..19172389b 100644
--- a/src/OS/unsupported/os.c-IRIX
+++ b/src/OS/unsupported/os.c-IRIX
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 2001 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/OS/unsupported/os.c-IRIX6 b/src/OS/unsupported/os.c-IRIX6
index d7a8b4f7a..19172389b 100644
--- a/src/OS/unsupported/os.c-IRIX6
+++ b/src/OS/unsupported/os.c-IRIX6
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 2001 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/OS/unsupported/os.c-IRIX632 b/src/OS/unsupported/os.c-IRIX632
index d7a8b4f7a..19172389b 100644
--- a/src/OS/unsupported/os.c-IRIX632
+++ b/src/OS/unsupported/os.c-IRIX632
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 2001 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/OS/unsupported/os.c-IRIX65 b/src/OS/unsupported/os.c-IRIX65
index d7a8b4f7a..19172389b 100644
--- a/src/OS/unsupported/os.c-IRIX65
+++ b/src/OS/unsupported/os.c-IRIX65
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 2001 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/exim_monitor/em_TextPop.c b/src/exim_monitor/em_TextPop.c
index f8fdefbf3..ff5d1a8f7 100644
--- a/src/exim_monitor/em_TextPop.c
+++ b/src/exim_monitor/em_TextPop.c
@@ -1,4 +1,5 @@
/***********************************************************
+Copyright (c) The Exim Maintainers 2022
Copyright 1989 by the Massachusetts Institute of Technology,
Cambridge, Massachusetts.
diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index 24146d3a7..ab37806b7 100644
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -3,7 +3,7 @@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2021 */
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c
index d9b2a7933..8d85c13f1 100644
--- a/src/exim_monitor/em_log.c
+++ b/src/exim_monitor/em_log.c
@@ -3,7 +3,7 @@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainters 2021 */
+/* Copyright (c) The Exim Maintainters 2021 - 2022 */
/* See the file NOTICE for conditions of use and distribution. */
/* This module contains code for scanning the main log,
diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c
index af1323064..69de8dc4d 100644
--- a/src/exim_monitor/em_main.c
+++ b/src/exim_monitor/em_main.c
@@ -3,7 +3,7 @@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2021 */
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/exim_monitor/em_queue.c b/src/exim_monitor/em_queue.c
index 276f3379b..9badd2451 100644
--- a/src/exim_monitor/em_queue.c
+++ b/src/exim_monitor/em_queue.c
@@ -3,7 +3,7 @@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 35bb755d5..9cdb931f3 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -3,7 +3,7 @@
# Script to build links for all the exim source files from the system-
# specific build directory. It should be run from within that directory.
#
-# Copyright (c) The Exim Maintainers 1995 - 2021
+# Copyright (c) The Exim Maintainers 1995 - 2022
test ! -d ../src && \
echo "*** $0 should be run in a system-specific subdirectory." && \
diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 1082f594e..ed8b0cb5c 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -1,5 +1,7 @@
#! /bin/sh
+# Copyright (c) The Exim Maintainers 1995 - 2021
+
# We turn the configure-built build-$foo/lookups/Makefile.predynamic into Makefile
# We always re-exec ourselves at least once, because it's the cleanest and
diff --git a/src/src/acl.c b/src/src/acl.c
index aa8699a8a..e2356e188 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Code for handling Access Control Lists (ACLs) */
diff --git a/src/src/arc.c b/src/src/arc.c
index 6c7891a6d..57a6281ef 100644
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -3,7 +3,7 @@
*************************************************/
/* Experimental ARC support for Exim
Copyright (c) Jeremy Harris 2018 - 2020
- Copyright (c) The Exim Maintainers 2021
+ Copyright (c) The Exim Maintainers 2021 - 2022
License: GPL
*/
diff --git a/src/src/auths/auth-spa.c b/src/src/auths/auth-spa.c
index 583a2b955..8d886b6b6 100644
--- a/src/src/auths/auth-spa.c
+++ b/src/src/auths/auth-spa.c
@@ -8,6 +8,8 @@
* All the original code used here was torn by Marc Prud'hommeaux out of the
* Samba project (by Andrew Tridgell, Jeremy Allison, and others).
+ *
+ * Copyright (c) The Exim Maintainers 2021
* Tom Kistner provided additional code, adding spa_build_auth_challenge() to
* support server authentication mode.
diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c
index 8a3195cc1..e7f9f521d 100644
--- a/src/src/auths/call_radius.c
+++ b/src/src/auths/call_radius.c
@@ -2,7 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2016 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/auths/cyrus_sasl.c b/src/src/auths/cyrus_sasl.c
index 17e92bb7c..c8e2da5de 100644
--- a/src/src/auths/cyrus_sasl.c
+++ b/src/src/auths/cyrus_sasl.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* This code was originally contributed by Matthew Byng-Maddick */
diff --git a/src/src/auths/cyrus_sasl.h b/src/src/auths/cyrus_sasl.h
index 0877a79ef..6cf883454 100644
--- a/src/src/auths/cyrus_sasl.h
+++ b/src/src/auths/cyrus_sasl.h
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2012 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/auths/dovecot.c b/src/src/auths/dovecot.c
index ca3d1bd1c..5d7713389 100644
--- a/src/src/auths/dovecot.c
+++ b/src/src/auths/dovecot.c
@@ -1,6 +1,6 @@
/*
+ * Copyright (c) The Exim Maintainers 2006 - 2022
* Copyright (c) 2004 Andrey Panin <pazke@donpac.ru>
- * Copyright (c) 2006-2020 The Exim Maintainers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index 8f74f4d75..bae5f081b 100644
--- a/src/src/auths/gsasl_exim.c
+++ b/src/src/auths/gsasl_exim.c
@@ -2,7 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2019 - 2021 */
+/* Copyright (c) The Exim Maintainers 2019 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/auths/gsasl_exim.h b/src/src/auths/gsasl_exim.h
index 93e624362..19c903611 100644
--- a/src/src/auths/gsasl_exim.h
+++ b/src/src/auths/gsasl_exim.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2019 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2012 */
-/* Copyright (c) The Exim Maintainers 2019-2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) Twitter Inc 2012 */
diff --git a/src/src/auths/heimdal_gssapi.c b/src/src/auths/heimdal_gssapi.c
index 3ba24b4ed..381763299 100644
--- a/src/src/auths/heimdal_gssapi.c
+++ b/src/src/auths/heimdal_gssapi.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) Twitter Inc 2012
diff --git a/src/src/auths/heimdal_gssapi.h b/src/src/auths/heimdal_gssapi.h
index 2e5921911..49775aff9 100644
--- a/src/src/auths/heimdal_gssapi.h
+++ b/src/src/auths/heimdal_gssapi.h
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2012 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/auths/pwcheck.c b/src/src/auths/pwcheck.c
index f2188bb6a..7dd529fbc 100644
--- a/src/src/auths/pwcheck.c
+++ b/src/src/auths/pwcheck.c
@@ -3,6 +3,7 @@
* Tim Martin
* $Id: checkpw.c,v 1.49 2002/03/07 19:14:04 ken3 Exp $
*/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/*
* Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
*
diff --git a/src/src/auths/xtextdecode.c b/src/src/auths/xtextdecode.c
index 3940767fa..746dfbdb4 100644
--- a/src/src/auths/xtextdecode.c
+++ b/src/src/auths/xtextdecode.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2009 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/auths/xtextencode.c b/src/src/auths/xtextencode.c
index 46f9c021c..fc571c799 100644
--- a/src/src/auths/xtextencode.c
+++ b/src/src/auths/xtextencode.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/base64.c b/src/src/base64.c
index f7ed0b5b5..fa06a7a34 100644
--- a/src/src/base64.c
+++ b/src/src/base64.c
@@ -6,7 +6,7 @@
/* License: GPL */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/bmi_spam.c b/src/src/bmi_spam.c
index 334022b00..af4bc4640 100644
--- a/src/src/bmi_spam.c
+++ b/src/src/bmi_spam.c
@@ -5,6 +5,7 @@
/* Code for calling Brightmail AntiSpam.
Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
License: GPL */
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
#include "exim.h"
#ifdef EXPERIMENTAL_BRIGHTMAIL
diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index a7f5812b2..f9a8febdf 100644
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/child.c b/src/src/child.c
index f0db2a3b4..1f38b585c 100644
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 6ddece4d0..25ab75506 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2018 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2018 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* The default settings for Exim configuration variables. A #define without
diff --git a/src/src/daemon.c b/src/src/daemon.c
index daedf0080..8e8a515e4 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions concerned with running Exim as a daemon */
diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index 600da18c4..ea94b7ff0 100644
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/dbfunctions.h b/src/src/dbfunctions.h
index 384613981..07d4a6233 100644
--- a/src/src/dbfunctions.h
+++ b/src/src/dbfunctions.h
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/debug.c b/src/src/debug.c
index f71146220..26d09ea2f 100644
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2015 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2015 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 941a8801e..8a9a174e3 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* The main code for delivering a message. */
diff --git a/src/src/directory.c b/src/src/directory.c
index 5363cd405..189020855 100644
--- a/src/src/directory.c
+++ b/src/src/directory.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2010 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2010 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "exim.h"
diff --git a/src/src/dkim.c b/src/src/dkim.c
index 0153024df..bb916d2eb 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge, 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021*/
/* See the file NOTICE for conditions of use and distribution. */
/* Code for DKIM support. Other DKIM relevant code is in
diff --git a/src/src/dkim_transport.c b/src/src/dkim_transport.c
index 146faff36..cfd4b9085 100644
--- a/src/src/dkim_transport.c
+++ b/src/src/dkim_transport.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index 1bbaa7718..17bba9d75 100644
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
/* DMARC support.
+ Copyright (c) The Exim Maintainers 2019 - 2022
Copyright (c) Todd Lyons <tlyons@exim.org> 2012 - 2014
- Copyright (c) The Exim Maintainers 2019 - 2021
License: GPL */
/* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;
diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index 2587a803d..899cd7e13 100644
--- a/src/src/dmarc.h
+++ b/src/src/dmarc.h
@@ -3,8 +3,8 @@
*************************************************/
/* Experimental DMARC support.
+ Copyright (c) The Exim Maintainers 2021 - 2022
Copyright (c) Todd Lyons <tlyons@exim.org> 2012 - 2014
- Copyright (c) The Exim Maintainers 2021
License: GPL */
/* Portions Copyright (c) 2012, 2013, The Trusted Domain Project;
diff --git a/src/src/dns.c b/src/src/dns.c
index dd29d5c15..7d7ee0c04 100644
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for interfacing with the DNS. */
diff --git a/src/src/dnsbl.c b/src/src/dnsbl.c
index e95da266b..db839af04 100644
--- a/src/src/dnsbl.c
+++ b/src/src/dnsbl.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions concerned with dnsbls */
diff --git a/src/src/drtables.c b/src/src/drtables.c
index 39f58f803..513ef6c4a 100644
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/exim.c b/src/src/exim.c
index 40955a9da..1a4b44945 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/exim.h b/src/src/exim.h
index 9d1819677..61642b5e7 100644
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index b33864702..5c046347b 100644
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 3a38c8df2..3824309b5 100644
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index 9dfa2c735..0661c5792 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -3,7 +3,7 @@
# Utility for searching and displaying queue information.
# Written by Matt Hubbard 15 August 2002
#
-# Copyright (c) The Exim Maintainers 2021
+# Copyright (c) The Exim Maintainers 2021 - 2022
# Except when they appear in comments, the following placeholders in this
# source are replaced when it is turned into a runnable script:
diff --git a/src/src/expand.c b/src/src/expand.c
index 1f6b933bf..e59625858 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/filter.c b/src/src/filter.c
index a037e2edf..ad017e567 100644
--- a/src/src/filter.c
+++ b/src/src/filter.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/filtertest.c b/src/src/filtertest.c
index 125e9c879..87ebfb14f 100644
--- a/src/src/filtertest.c
+++ b/src/src/filtertest.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/functions.h b/src/src/functions.h
index ba4996f42..f8e0cd77e 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/globals.c b/src/src/globals.c
index 844ff7bac..918b2c304 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
@@ -1638,7 +1638,7 @@ uschar *uucp_from_sender = US"$1";
uschar *verify_mode = NULL;
uschar *version_copyright =
US"Copyright (c) University of Cambridge, 1995 - 2018\n"
- "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2020";
+ "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2022";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";
diff --git a/src/src/globals.h b/src/src/globals.h
index e8635eefc..f2de276f3 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Almost all the global variables are defined together in this one header, so
diff --git a/src/src/hash.c b/src/src/hash.c
index 85e10d5d5..51bcd4604 100644
--- a/src/src/hash.c
+++ b/src/src/hash.c
@@ -1,7 +1,7 @@
/*
* Exim - an Internet mail transport agent
*
- * Copyright (C) 2010 - 2018 Exim maintainers
+ * Copyright (c) The Exim Maintainers 2010 - 2022
* Copyright (c) University of Cambridge 1995 - 2009
*
* Hash interface functions
diff --git a/src/src/hash.h b/src/src/hash.h
index 57ef3da82..588325baf 100644
--- a/src/src/hash.h
+++ b/src/src/hash.h
@@ -1,7 +1,6 @@
/*
* Exim - an Internet mail transport agent
- *
- * Copyright (C) 1995 - 2018 Exim maintainers
+ * Copyright (c) The Exim Maintainers 1995 - 2022
*
* Hash interface functions
*/
diff --git a/src/src/header.c b/src/src/header.c
index df84e2a53..898d8d5c4 100644
--- a/src/src/header.c
+++ b/src/src/header.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2016 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/hintsdb.h b/src/src/hintsdb.h
index 22ba13cad..e3e9e98d8 100644
--- a/src/src/hintsdb.h
+++ b/src/src/hintsdb.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) The Exim Maintainers 2020 - 2022 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* This header file contains macro definitions so that a variety of DBM
diff --git a/src/src/host.c b/src/src/host.c
index 2b09cc260..f69e0341a 100644
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for finding hosts, either by gethostbyname(), gethostbyaddr(), or
diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 375a87642..c609a27e3 100644
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2020 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* This file is the header that is the only Exim header to be included in the
diff --git a/src/src/log.c b/src/src/log.c
index 0a41cd35a..18ea3e0cf 100644
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing log files. The code for maintaining datestamped
diff --git a/src/src/lookupapi.h b/src/src/lookupapi.h
index af7f59a06..41cc239ce 100644
--- a/src/src/lookupapi.h
+++ b/src/src/lookupapi.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2015 */
/* Copyright (c) The Exim Maintainers 2022 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/lookups/cdb.c b/src/src/lookups/cdb.c
index 5f8498809..966078f1a 100644
--- a/src/src/lookups/cdb.c
+++ b/src/src/lookups/cdb.c
@@ -6,8 +6,8 @@
* Exim - CDB database lookup module
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
+ * Copyright (c) The Exim Maintainers 2020 - 2022
* Copyright (c) 1998 Nigel Metheringham, Planet Online Ltd
- * Copyright (c) The Exim Maintainers 2020 - 2021
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c
index 95f31bc16..edc49e581 100644
--- a/src/src/lookups/dbmdb.c
+++ b/src/src/lookups/dbmdb.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index b1bd48bfc..355be1b5d 100644
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/dsearch.c b/src/src/lookups/dsearch.c
index 2c4f13426..a7691024a 100644
--- a/src/src/lookups/dsearch.c
+++ b/src/src/lookups/dsearch.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* The idea for this code came from Matthew Byng-Maddick, but his original has
diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c
index d72623037..c4fff71bd 100644
--- a/src/src/lookups/ibase.c
+++ b/src/src/lookups/ibase.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* The code in this module was contributed by Ard Biesheuvel. */
diff --git a/src/src/lookups/json.c b/src/src/lookups/json.c
index e53ddc219..c9abf8c4c 100644
--- a/src/src/lookups/json.c
+++ b/src/src/lookups/json.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2019-2020 */
-/* Copyright (c) The Exim Maintainers 2021 */
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
+/* Copyright (c) Jeremy Harris 2019 - 2020 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 6065d2b8e..9751fa3b3 100644
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Many thanks to Stuart Lynne for contributing the original code for this
diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c
index 3204e1256..ce6f1635a 100644
--- a/src/src/lookups/lf_sqlperform.c
+++ b/src/src/lookups/lf_sqlperform.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/lookups/lmdb.c b/src/src/lookups/lmdb.c
index 042229a55..a32c7f7fb 100644
--- a/src/src/lookups/lmdb.c
+++ b/src/src/lookups/lmdb.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 2016 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/lsearch.c b/src/src/lookups/lsearch.c
index 562acdb66..dcfdec91e 100644
--- a/src/src/lookups/lsearch.c
+++ b/src/src/lookups/lsearch.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
index d874d88cc..78b8c2b19 100644
--- a/src/src/lookups/mysql.c
+++ b/src/src/lookups/mysql.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Thanks to Paul Kelly for contributing the original code for these
diff --git a/src/src/lookups/nis.c b/src/src/lookups/nis.c
index 795da3891..0024f44cf 100644
--- a/src/src/lookups/nis.c
+++ b/src/src/lookups/nis.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/nisplus.c b/src/src/lookups/nisplus.c
index 0892fc4c3..d9f3f7d83 100644
--- a/src/src/lookups/nisplus.c
+++ b/src/src/lookups/nisplus.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
index 8a6954035..d32b5e44d 100644
--- a/src/src/lookups/oracle.c
+++ b/src/src/lookups/oracle.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Interface to an Oracle database. This code was originally supplied by
diff --git a/src/src/lookups/passwd.c b/src/src/lookups/passwd.c
index 00e754834..eaf78b210 100644
--- a/src/src/lookups/passwd.c
+++ b/src/src/lookups/passwd.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
index dc5fd5750..4bb693ad1 100644
--- a/src/src/lookups/pgsql.c
+++ b/src/src/lookups/pgsql.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Thanks to Petr Cech for contributing the original code for these
diff --git a/src/src/lookups/readsock.c b/src/src/lookups/readsock.c
index bb1e6ca9a..22179c91c 100644
--- a/src/src/lookups/readsock.c
+++ b/src/src/lookups/readsock.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) Jeremy Harris 2020 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c
index 2ddc99abc..9c8559c1e 100644
--- a/src/src/lookups/redis.c
+++ b/src/src/lookups/redis.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c
index 9be118183..78d954c8c 100644
--- a/src/src/lookups/spf.c
+++ b/src/src/lookups/spf.c
@@ -5,14 +5,13 @@
/* Exim - SPF lookup module using libspf2
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Copyright (c) The Exim Maintainers 2020 - 2022
Copyright (c) 2005 Chris Webb, Arachsys Internet Services Ltd
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-
-Copyright (c) The Exim Maintainers 2020
*/
#include "../exim.h"
diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c
index 69c0ac7ba..9080ae702 100644
--- a/src/src/lookups/sqlite.c
+++ b/src/src/lookups/sqlite.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/testdb.c b/src/src/lookups/testdb.c
index 04c1310af..48241615f 100644
--- a/src/src/lookups/testdb.c
+++ b/src/src/lookups/testdb.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/lookups/whoson.c b/src/src/lookups/whoson.c
index cbcf45b7c..990703fd0 100644
--- a/src/src/lookups/whoson.c
+++ b/src/src/lookups/whoson.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* This code originally came from Robert Wal. */
diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 2cde1b6cb..a0c659c9f 100644
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) Jeremy Harris 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Create a static data structure with the predefined macros, to be
diff --git a/src/src/macros.h b/src/src/macros.h
index 659a70f48..304e45d33 100644
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/malware.c b/src/src/malware.c
index 289b64672..4719a5d61 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -2,9 +2,10 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
+/*
+ * Copyright (c) The Exim Maintainers 2015 - 2022
+ * Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2015 - 2021
*/
/* Code for calling virus (malware) scanners. Called from acl.c. */
diff --git a/src/src/match.c b/src/src/match.c
index 0d2cdb57d..2e4bff078 100644
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for matching strings */
diff --git a/src/src/mime.c b/src/src/mime.c
index ddf923c25..c1921992e 100644
--- a/src/src/mime.c
+++ b/src/src/mime.c
@@ -2,9 +2,10 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2015
+/*
+ * Copyright (c) The Exim Maintainers 2015 - 2022
+ * Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2015 - 2020
*/
#include "exim.h"
diff --git a/src/src/moan.c b/src/src/moan.c
index efa0f02e8..4f2550d82 100644
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for sending messages to sender or to mailmaster. */
diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index 8ccc679bb..49fed0a9d 100644
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/os.c b/src/src/os.c
index 1b826f3dc..ac5f61b65 100644
--- a/src/src/os.c
+++ b/src/src/os.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#ifdef STAND_ALONE
diff --git a/src/src/parse.c b/src/src/parse.c
index 3a7a4f18a..f156865c8 100644
--- a/src/src/parse.c
+++ b/src/src/parse.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for parsing addresses */
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 4d77233b6..e47bfc505 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -1,9 +1,9 @@
/*
* PDKIM - a RFC4871 (DKIM) implementation
*
+ * Copyright (c) The Exim Maintainers 2021 - 2022
* Copyright (C) 2009 - 2016 Tom Kistner <tom@duncanthrax.net>
* Copyright (C) 2016 - 2020 Jeremy Harris <jgh@exim.org>
- * Copyright (c) The Exim Maintainers 2021
*
* http://duncanthrax.net/pdkim/
*
diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index a71d63692..d78f31acf 100644
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -1,7 +1,6 @@
/*
* PDKIM - a RFC4871 (DKIM) implementation
- *
- * Copyright (c) The Exim Maintainers 1995 - 2021
+ * Copyright (c) The Exim Maintainers 1995 - 2022
*
* signing/verification interface
*/
diff --git a/src/src/perl.c b/src/src/perl.c
index c6d329102..f07ee2e27 100644
--- a/src/src/perl.c
+++ b/src/src/perl.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 1999 - 2022 */
/* Copyright (c) 1998 Malcolm Beattie */
-/* Copyright (C) 1999 - 2018 Exim maintainers */
/* Modified by PH to get rid of the "na" usage, March 1999.
Modified further by PH for general tidying for Exim 4.
diff --git a/src/src/queue.c b/src/src/queue.c
index 2933c5439..4bdd6fb14 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
diff --git a/src/src/rda.c b/src/src/rda.c
index 10a44c15c..b635ebfde 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* This module contains code for extracting addresses from a forwarding list
diff --git a/src/src/readconf.c b/src/src/readconf.c
index dc43d30f5..06bc50fd8 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for reading the configuration file, and for displaying
diff --git a/src/src/receive.c b/src/src/receive.c
index ba84967c1..a6ecb0a90 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Code for receiving a message and setting up spool files. */
diff --git a/src/src/regex.c b/src/src/regex.c
index c1acf4c6e..5c0f7c4e0 100644
--- a/src/src/regex.c
+++ b/src/src/regex.c
@@ -2,9 +2,10 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
+/*
+ * Copyright (c) The Exim Maintainers 2016 - 2022
+ * Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2021
*/
/* Code for matching regular expressions against headers and body.
diff --git a/src/src/retry.c b/src/src/retry.c
index a3cf9b1fb..033afb4bf 100644
--- a/src/src/retry.c
+++ b/src/src/retry.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions concerned with retrying unsuccessful deliveries. */
diff --git a/src/src/rewrite.c b/src/src/rewrite.c
index 9420e79b9..005dc51fe 100644
--- a/src/src/rewrite.c
+++ b/src/src/rewrite.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions concerned with rewriting headers */
diff --git a/src/src/rfc2047.c b/src/src/rfc2047.c
index 1138d2dbe..1ed1dd809 100644
--- a/src/src/rfc2047.c
+++ b/src/src/rfc2047.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* This file contains a function for decoding message header lines that may
diff --git a/src/src/route.c b/src/src/route.c
index 74a792258..fa69b8b74 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions concerned with routing, and the list of generic router options. */
diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
index 807191b91..a845b4e52 100644
--- a/src/src/routers/dnslookup.c
+++ b/src/src/routers/dnslookup.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/routers/ipliteral.c b/src/src/routers/ipliteral.c
index f2ec486fb..3d68642a2 100644
--- a/src/src/routers/ipliteral.c
+++ b/src/src/routers/ipliteral.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/routers/iplookup.c b/src/src/routers/iplookup.c
index bbef1c063..94cde4e04 100644
--- a/src/src/routers/iplookup.c
+++ b/src/src/routers/iplookup.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/routers/manualroute.c b/src/src/routers/manualroute.c
index 12d87a689..974ad0cf4 100644
--- a/src/src/routers/manualroute.c
+++ b/src/src/routers/manualroute.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/routers/queryprogram.c b/src/src/routers/queryprogram.c
index 0d03f1ea3..55f03a477 100644
--- a/src/src/routers/queryprogram.c
+++ b/src/src/routers/queryprogram.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c
index 6a26de9ee..31c07f518 100644
--- a/src/src/routers/redirect.c
+++ b/src/src/routers/redirect.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/routers/redirect.h b/src/src/routers/redirect.h
index ad5a3946a..4c0399a36 100644
--- a/src/src/routers/redirect.h
+++ b/src/src/routers/redirect.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Header for the redirect router */
diff --git a/src/src/routers/rf_change_domain.c b/src/src/routers/rf_change_domain.c
index e3a623aec..d7c9c1cb8 100644
--- a/src/src/routers/rf_change_domain.c
+++ b/src/src/routers/rf_change_domain.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/routers/rf_get_munge_headers.c b/src/src/routers/rf_get_munge_headers.c
index 4cd1752d4..d304d1145 100644
--- a/src/src/routers/rf_get_munge_headers.c
+++ b/src/src/routers/rf_get_munge_headers.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/routers/rf_get_transport.c b/src/src/routers/rf_get_transport.c
index 3883a7698..2f639e037 100644
--- a/src/src/routers/rf_get_transport.c
+++ b/src/src/routers/rf_get_transport.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/search.c b/src/src/search.c
index bf709763c..eec543776 100644
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* A set of functions to search databases in various formats. An open
diff --git a/src/src/sieve.c b/src/src/sieve.c
index d1f5d93c8..af3bc9d9a 100644
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -2,8 +2,9 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Michael Haardt 2003 - 2015
- * Copyright (c) The Exim Maintainers 2016 - 2021
+/*
+ * Copyright (c) The Exim Maintainers 2016 - 2022
+ * Copyright (c) Michael Haardt 2003 - 2015
* See the file NOTICE for conditions of use and distribution.
*/
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index fa727ed1f..6de85a15f 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for handling an incoming SMTP call. */
diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 610e4a068..7b7bdf752 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* A number of functions for driving outgoing SMTP calls. */
diff --git a/src/src/spam.c b/src/src/spam.c
index 614c9ecc7..a68b9bf60 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -2,9 +2,10 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
+/*
+ * Copyright (c) The Exim Maintainers 2016 - 2022
+ * Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2021
*/
/* Code for calling spamassassin's spamd. Called from acl.c. */
diff --git a/src/src/spf.c b/src/src/spf.c
index e3df789fb..db6eea3a8 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -3,9 +3,9 @@
*************************************************/
/* SPF support.
+ Copyright (c) The Exim Maintainers 2015 - 2022
Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014
License: GPL
- Copyright (c) The Exim Maintainers 2015 - 2021
*/
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
diff --git a/src/src/spf.h b/src/src/spf.h
index 7148babed..f32d06906 100644
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -3,9 +3,9 @@
*************************************************/
/* Experimental SPF support.
+ Copyright (c) The Exim Maintainers 2016 - 2022
Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
License: GPL
- Copyright (c) The Exim Maintainers 2016 - 2020
*/
#ifdef SUPPORT_SPF
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 940baa419..82885db56 100644
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for reading spool files. When compiling for a utility (eximon),
diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index bfa935eb0..e04917ca5 100644
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing spool files, and moving them about. */
diff --git a/src/src/store.c b/src/src/store.c
index ffc1ca8e6..5ec636bd1 100644
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim maintainers 2019 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim maintainers 2019 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Exim gets and frees all its store through these functions. In the original
diff --git a/src/src/store.h b/src/src/store.h
index 1917e654d..ee6d79c36 100644
--- a/src/src/store.h
+++ b/src/src/store.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2009 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Header for Exim's memory allocation functions */
diff --git a/src/src/string.c b/src/src/string.c
index c23055d47..a5161bb31 100644
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Miscellaneous string-handling functions. Some are not required for
diff --git a/src/src/structs.h b/src/src/structs.h
index 087683c49..3debd60f3 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 634d4011e..52cf30d9a 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -2,9 +2,9 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) Phil Pennock 2012 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* This file provides TLS/SSL support for Exim using the GnuTLS library,
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index bab02d056..f8b4db06a 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2019 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Portions Copyright (c) The OpenSSL Project 1999 */
diff --git a/src/src/tls.c b/src/src/tls.c
index e80dd9aaf..c48394cdb 100644
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) The Exim Maintainers 2020 - 2022 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* This module provides TLS (aka SSL) support for Exim. The code for OpenSSL is
diff --git a/src/src/tlscert-gnu.c b/src/src/tlscert-gnu.c
index 99acf5ec0..a40bb30bf 100644
--- a/src/src/tlscert-gnu.c
+++ b/src/src/tlscert-gnu.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) Jeremy Harris 2014 - 2018 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* This file provides TLS/SSL support for Exim using the GnuTLS library,
one of the available supported implementations. This file is #included into
diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index abe34966b..168e35b7f 100644
--- a/src/src/tlscert-openssl.c
+++ b/src/src/tlscert-openssl.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) Jeremy Harris 2014 - 2019 */
/* This module provides TLS (aka SSL) support for Exim using the OpenSSL
diff --git a/src/src/transport.c b/src/src/transport.c
index f21b87c22..cce1c46ae 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* General functions concerned with transportation, and generic options for all
diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index 77115acc7..93281efda 100644
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2020 */
-/* Copyright (c) The Exim maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
index a2441d209..42466875a 100644
--- a/src/src/transports/autoreply.c
+++ b/src/src/transports/autoreply.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c
index 638b52849..f751771c1 100644
--- a/src/src/transports/lmtp.c
+++ b/src/src/transports/lmtp.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index ed16c4c70..bdbe27d57 100644
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index e2368da13..d00f15fe1 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index 8dbd1fcf3..319e8494e 100644
--- a/src/src/transports/smtp.h
+++ b/src/src/transports/smtp.h
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#define DELIVER_BUFFER_SIZE 4096
diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
index 4dd03c1f1..0e58732c6 100644
--- a/src/src/transports/smtp_socks.c
+++ b/src/src/transports/smtp_socks.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) Jeremy Harris 2015 - 2018 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* SOCKS version 5 proxy, client-mode */
diff --git a/src/src/tree.c b/src/src/tree.c
index a42103738..bb8ad44db 100644
--- a/src/src/tree.c
+++ b/src/src/tree.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for maintaining binary balanced trees and some associated
diff --git a/src/src/utf8.c b/src/src/utf8.c
index 168e7fc7f..bc7adb828 100644
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -2,6 +2,7 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2022 */
/* Copyright (c) Jeremy Harris 2015 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
diff --git a/src/src/verify.c b/src/src/verify.c
index ed0898c9b..82fae89c1 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -2,8 +2,8 @@
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions concerned with verifying things. The original code for callout