From 80fea873648ca2ab2e592999a336c59cf054ab55 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 2 Apr 2016 15:53:53 +0100 Subject: [PATCH 1/1] Copyright year updates (things touched in 2016) Update current year in docs and banner copyright in src/src/globals.c Rest of changes from: vi $(git whatchanged --since=2016-01-01 | grep '^:100' | sed -n 's/^[^M]*M//p' | sort -u | fgrep -v test/) --- doc/doc-docbook/spec.xfpt | 2 +- release-process/scripts/mk_exim_release.pl | 1 + src/OS/Makefile-Base | 2 ++ src/OS/os.c-Linux | 2 +- src/exim_monitor/em_log.c | 2 +- src/exim_monitor/em_main.c | 2 +- src/exim_monitor/em_menu.c | 2 +- src/exim_monitor/em_xs.c | 2 +- src/scripts/Configure-Makefile | 2 ++ src/scripts/MakeLinks | 2 ++ src/scripts/reversion | 1 + src/src/acl.c | 2 +- src/src/auths/call_radius.c | 2 +- src/src/auths/cram_md5.c | 2 +- src/src/auths/dovecot.c | 2 +- src/src/auths/get_data.c | 2 +- src/src/auths/heimdal_gssapi.c | 2 +- src/src/auths/sha1.c | 2 +- src/src/auths/tls.c | 2 +- src/src/base64.c | 2 +- src/src/buildconfig.c | 2 +- src/src/config.h.defaults | 2 +- src/src/daemon.c | 2 +- src/src/dane-openssl.c | 2 ++ src/src/dcc.c | 2 ++ src/src/deliver.c | 2 +- src/src/demime.c | 6 ++++-- src/src/dkim.c | 2 +- src/src/dkim.h | 2 +- src/src/dns.c | 2 +- src/src/drtables.c | 2 +- src/src/exim.c | 2 +- src/src/exim.h | 2 +- src/src/exim_dbutil.c | 2 +- src/src/exim_lock.c | 2 ++ src/src/eximstats.src | 2 +- src/src/expand.c | 2 +- src/src/functions.h | 2 +- src/src/globals.c | 6 +++--- src/src/globals.h | 2 +- src/src/header.c | 2 +- src/src/host.c | 2 +- src/src/ip.c | 2 +- src/src/log.c | 2 +- src/src/lookups/ldap.c | 2 +- src/src/lookups/spf.c | 1 + src/src/macros.h | 2 +- src/src/malware.c | 6 ++++-- src/src/mime.c | 6 ++++-- src/src/mime.h | 6 ++++-- src/src/moan.c | 2 +- src/src/os.c | 2 +- src/src/osfunctions.h | 2 +- src/src/pdkim/pdkim.h | 1 + src/src/rda.c | 2 +- src/src/readconf.c | 2 +- src/src/receive.c | 2 +- src/src/regex.c | 6 ++++-- src/src/routers/manualroute.c | 2 +- src/src/routers/queryprogram.c | 2 +- src/src/routers/redirect.c | 2 +- src/src/setenv.c | 5 +++-- src/src/sieve.c | 6 ++++-- src/src/smtp_in.c | 2 +- src/src/smtp_out.c | 2 +- src/src/spam.c | 6 ++++-- src/src/spf.c | 4 +++- src/src/spf.h | 6 ++++-- src/src/spool_in.c | 2 +- src/src/spool_mbox.c | 6 ++++-- src/src/spool_out.c | 2 +- src/src/srs.c | 1 + src/src/store.c | 2 +- src/src/string.c | 2 +- src/src/tls-openssl.c | 2 +- src/src/tls.c | 2 +- src/src/tlscert-openssl.c | 2 +- src/src/transport.c | 2 +- src/src/transports/appendfile.c | 2 +- src/src/transports/autoreply.c | 2 +- src/src/transports/lmtp.c | 2 +- src/src/transports/smtp.c | 2 +- src/src/verify.c | 2 +- 83 files changed, 122 insertions(+), 84 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 6185536b9..0d5577f06 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -52,7 +52,7 @@ .set I "    " .macro copyyear -2015 +2016 .endmacro . ///////////////////////////////////////////////////////////////////////////// diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl index 553ea95a9..9b2971f07 100755 --- a/release-process/scripts/mk_exim_release.pl +++ b/release-process/scripts/mk_exim_release.pl @@ -1,4 +1,5 @@ #!/usr/bin/env perl +# Copyright (c) The Exim Maintainers 2016 use strict; use warnings; diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 3f07396f6..229961f1b 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -4,6 +4,8 @@ # concatentates the configuration settings from Local/Makefile and other, # optional, Local/* files at the front of this file, to create Makefile in the # build directory. +# +# Copyright (c) The Exim Maintainers 2016 SHELL = $(MAKE_SHELL) SCRIPTS = ../scripts diff --git a/src/OS/os.c-Linux b/src/OS/os.c-Linux index 0043e8627..4bca77615 100644 --- a/src/OS/os.c-Linux +++ b/src/OS/os.c-Linux @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1997 - 2014 */ +/* Copyright (c) University of Cambridge 1997 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Linux-specific code. This is concatenated onto the generic diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c index 4d8c29312..9ff994ced 100644 --- a/src/exim_monitor/em_log.c +++ b/src/exim_monitor/em_log.c @@ -2,7 +2,7 @@ * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2014 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 019bdffda..3034a041c 100644 --- a/src/exim_monitor/em_main.c +++ b/src/exim_monitor/em_main.c @@ -2,7 +2,7 @@ * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2014 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/exim_monitor/em_menu.c b/src/exim_monitor/em_menu.c index 81df0d37c..51a952e99 100644 --- a/src/exim_monitor/em_menu.c +++ b/src/exim_monitor/em_menu.c @@ -2,7 +2,7 @@ * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/exim_monitor/em_xs.c b/src/exim_monitor/em_xs.c index c91b7dea9..b145fb993 100644 --- a/src/exim_monitor/em_xs.c +++ b/src/exim_monitor/em_xs.c @@ -2,7 +2,7 @@ * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge, 1995 - 2007 */ +/* Copyright (c) University of Cambridge, 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* This file contains a number of subroutines that are in effect diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile index 8f40d1c95..4aa7d76cd 100755 --- a/src/scripts/Configure-Makefile +++ b/src/scripts/Configure-Makefile @@ -4,6 +4,8 @@ # from inside the directory. It does its own checking of when to rebuild; it # just got too horrendous to get it right in "make", because of the optionally # existing configuration files. +# +# Copyright (c) The Exim Maintainers 2016 # First off, get the OS type, and check that there is a make file for it. diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks index 9420b11c6..68cecf0a9 100755 --- a/src/scripts/MakeLinks +++ b/src/scripts/MakeLinks @@ -2,6 +2,8 @@ # 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 2016 test ! -d ../src && \ echo "*** $0 should be run in a system-specific subdirectory." && \ diff --git a/src/scripts/reversion b/src/scripts/reversion index 2cf3277fc..9707b9c1c 100755 --- a/src/scripts/reversion +++ b/src/scripts/reversion @@ -1,4 +1,5 @@ #!/bin/sh +# Copyright (c) The Exim Maintainers 2016 set -e LC_ALL=C diff --git a/src/src/acl.c b/src/src/acl.c index 236cfb7bd..0bc00ac38 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Code for handling Access Control Lists (ACLs) */ diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c index 455000ea7..d93e6a94a 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) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* This file was originally supplied by Ian Kirk. The libradius support came diff --git a/src/src/auths/cram_md5.c b/src/src/auths/cram_md5.c index 2d5c0d1e2..28526a632 100644 --- a/src/src/auths/cram_md5.c +++ b/src/src/auths/cram_md5.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 612aed39a..5bf7b9cc3 100644 --- a/src/src/auths/dovecot.c +++ b/src/src/auths/dovecot.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2004 Andrey Panin - * Copyright (c) 2006-2014 The Exim Maintainers + * Copyright (c) 2006-2016 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/get_data.c b/src/src/auths/get_data.c index 4d6c6d4a6..f839a010e 100644 --- a/src/src/auths/get_data.c +++ b/src/src/auths/get_data.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" diff --git a/src/src/auths/heimdal_gssapi.c b/src/src/auths/heimdal_gssapi.c index 94e689d58..732a67381 100644 --- a/src/src/auths/heimdal_gssapi.c +++ b/src/src/auths/heimdal_gssapi.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Copyright (c) Twitter Inc 2012 diff --git a/src/src/auths/sha1.c b/src/src/auths/sha1.c index a92bb71d1..753bea3db 100644 --- a/src/src/auths/sha1.c +++ b/src/src/auths/sha1.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ #ifndef STAND_ALONE diff --git a/src/src/auths/tls.c b/src/src/auths/tls.c index 2a995125e..99c756374 100644 --- a/src/src/auths/tls.c +++ b/src/src/auths/tls.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Jeremy Harris 2015 */ +/* Copyright (c) Jeremy Harris 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* This file provides an Exim authenticator driver for diff --git a/src/src/base64.c b/src/src/base64.c index 031beb923..cee77c3c3 100644 --- a/src/src/base64.c +++ b/src/src/base64.c @@ -5,7 +5,7 @@ /* Copyright (c) Tom Kistner 2004, 2015 */ /* License: GPL */ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index 45e820c81..4c1a72d51 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2012 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 a7b505a48..266c2688b 100644 --- a/src/src/config.h.defaults +++ b/src/src/config.h.defaults @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 6c1919304..89a7a0183 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions concerned with running Exim as a daemon */ diff --git a/src/src/dane-openssl.c b/src/src/dane-openssl.c index 674ca380b..b240fe141 100644 --- a/src/src/dane-openssl.c +++ b/src/src/dane-openssl.c @@ -1,6 +1,8 @@ /* * Author: Viktor Dukhovni * License: THIS CODE IS IN THE PUBLIC DOMAIN. + * + * Copyright (c) The Exim Maintainers 2014 - 2016 */ #include #include diff --git a/src/src/dcc.c b/src/src/dcc.c index 60615ec3e..c9d0db236 100644 --- a/src/src/dcc.c +++ b/src/src/dcc.c @@ -6,6 +6,8 @@ * Vienna University Computer Center * wbreyha@gmx.net * See the file NOTICE for conditions of use and distribution. + * + * Copyright (c) The Exim Maintainers 2015 - 2016 */ /* This patch is based on code from Tom Kistners exiscan (ACL integration) and diff --git a/src/src/deliver.c b/src/src/deliver.c index a5cefeee7..1a9fb7da0 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* The main code for delivering a message. */ diff --git a/src/src/demime.c b/src/src/demime.c index 622c1c8e3..fc778fae4 100644 --- a/src/src/demime.c +++ b/src/src/demime.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2003-???? */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2003-???? + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ /* Code for unpacking MIME containers. Called from acl.c. */ diff --git a/src/src/dkim.c b/src/src/dkim.c index 349947ab1..80ac8800b 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge, 1995 - 2015 */ +/* Copyright (c) University of Cambridge, 1995 - 2016 */ /* 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.h b/src/src/dkim.h index 1655f8e45..0dade972f 100644 --- a/src/src/dkim.h +++ b/src/src/dkim.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge, 1995 - 2015 */ +/* Copyright (c) University of Cambridge, 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ void dkim_exim_init(void); diff --git a/src/src/dns.c b/src/src/dns.c index 17152d9a6..1d5384e9d 100644 --- a/src/src/dns.c +++ b/src/src/dns.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for interfacing with the DNS. */ diff --git a/src/src/drtables.c b/src/src/drtables.c index d427f3215..d07123453 100644 --- a/src/src/drtables.c +++ b/src/src/drtables.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/exim.c b/src/src/exim.c index cc3172dc0..ede4e0b8d 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/exim.h b/src/src/exim.h index 385c3624e..5582ea94a 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 4dd143fea..c7fd845f6 100644 --- a/src/src/exim_dbutil.c +++ b/src/src/exim_dbutil.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/exim_lock.c b/src/src/exim_lock.c index 4b2209b05..158ec6836 100644 --- a/src/src/exim_lock.c +++ b/src/src/exim_lock.c @@ -9,6 +9,8 @@ Options: -fcntl use fcntl() lock Default is -fcntl -lockfile. Argument: the name of the lock file + +Copyright (c) The Exim Maintainers 2016 */ #include "os.h" diff --git a/src/src/eximstats.src b/src/src/eximstats.src index 2369ec38a..e6485fffc 100644 --- a/src/src/eximstats.src +++ b/src/src/eximstats.src @@ -1,6 +1,6 @@ #!PERL_COMMAND -w -# Copyright (c) 2001-2014 University of Cambridge. +# Copyright (c) 2001-2016 University of Cambridge. # See the file NOTICE for conditions of use and distribution. # Perl script to generate statistics from one or more Exim log files. diff --git a/src/src/expand.c b/src/src/expand.c index 892134c0f..73cb99ef8 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/functions.h b/src/src/functions.h index cce26b536..524f2cc00 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/globals.c b/src/src/globals.c index da6e4b31d..ec2685b22 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* All the global variables are defined together in this one module, so @@ -1506,8 +1506,8 @@ uschar *uucp_from_sender = US"$1"; uschar *verify_mode = NULL; uschar *version_copyright = - US"Copyright (c) University of Cambridge, 1995 - 2015\n" - "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2015"; + US"Copyright (c) University of Cambridge, 1995 - 2016\n" + "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2016"; 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 b83f9fe8a..57a569580 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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/header.c b/src/src/header.c index e6f41b8b9..dad1638cb 100644 --- a/src/src/header.c +++ b/src/src/header.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/host.c b/src/src/host.c index f94de5eab..7bfa312ed 100644 --- a/src/src/host.c +++ b/src/src/host.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for finding hosts, either by gethostbyname(), gethostbyaddr(), or diff --git a/src/src/ip.c b/src/src/ip.c index d5d8fceec..04b86060f 100644 --- a/src/src/ip.c +++ b/src/src/ip.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for doing things with sockets. With the advent of IPv6 this has diff --git a/src/src/log.c b/src/src/log.c index ccb7f3663..9e6809720 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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/lookups/ldap.c b/src/src/lookups/ldap.c index 0f78a9452..40c84b1ad 100644 --- a/src/src/lookups/ldap.c +++ b/src/src/lookups/ldap.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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/spf.c b/src/src/lookups/spf.c index 8b846ba55..ad56a2a8d 100644 --- a/src/src/lookups/spf.c +++ b/src/src/lookups/spf.c @@ -13,6 +13,7 @@ * 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 2016 */ #include "../exim.h" diff --git a/src/src/macros.h b/src/src/macros.h index 3f036e7ae..89dee87c9 100644 --- a/src/src/macros.h +++ b/src/src/macros.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/malware.c b/src/src/malware.c index 9451392f2..b67f31598 100644 --- a/src/src/malware.c +++ b/src/src/malware.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2003 - 2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2003 - 2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ /* Code for calling virus (malware) scanners. Called from acl.c. */ diff --git a/src/src/mime.c b/src/src/mime.c index bf140ccfb..089ee9954 100644 --- a/src/src/mime.c +++ b/src/src/mime.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2004, 2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2004, 2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ #include "exim.h" #ifdef WITH_CONTENT_SCAN /* entire file */ diff --git a/src/src/mime.h b/src/src/mime.h index 8dfdf5554..5fd4392d5 100644 --- a/src/src/mime.h +++ b/src/src/mime.h @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2004, 2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2004, 2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ #ifdef WITH_CONTENT_SCAN diff --git a/src/src/moan.c b/src/src/moan.c index 3a490028b..6d922a5a4 100644 --- a/src/src/moan.c +++ b/src/src/moan.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for sending messages to sender or to mailmaster. */ diff --git a/src/src/os.c b/src/src/os.c index d40fb606d..689ebfb1b 100644 --- a/src/src/os.c +++ b/src/src/os.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2014 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ #ifdef STAND_ALONE diff --git a/src/src/osfunctions.h b/src/src/osfunctions.h index 0e429fc8c..a8e87fc3e 100644 --- a/src/src/osfunctions.h +++ b/src/src/osfunctions.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Prototypes for os-specific functions. For utilities, we don't need the one diff --git a/src/src/pdkim/pdkim.h b/src/src/pdkim/pdkim.h index 4de0a7ad6..2c09bb3de 100644 --- a/src/src/pdkim/pdkim.h +++ b/src/src/pdkim/pdkim.h @@ -2,6 +2,7 @@ * PDKIM - a RFC4871 (DKIM) implementation * * Copyright (C) 2009 - 2012 Tom Kistner + * Copyright (c) Jeremy Harris 2016 * * http://duncanthrax.net/pdkim/ * diff --git a/src/src/rda.c b/src/src/rda.c index cf663a5ca..476f06050 100644 --- a/src/src/rda.c +++ b/src/src/rda.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 c547c78b7..5ca6a8476 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 f4b3d7824..e2a3c8aa4 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 b3ef31c3e..233a56bce 100644 --- a/src/src/regex.c +++ b/src/src/regex.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2003-2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2003-2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ /* Code for matching regular expressions against headers and body. Called from acl.c. */ diff --git a/src/src/routers/manualroute.c b/src/src/routers/manualroute.c index fd331b691..95c69328d 100644 --- a/src/src/routers/manualroute.c +++ b/src/src/routers/manualroute.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 9970c8299..bfcaefcfd 100644 --- a/src/src/routers/queryprogram.c +++ b/src/src/routers/queryprogram.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 a69d36e39..2434d3cb7 100644 --- a/src/src/routers/redirect.c +++ b/src/src/routers/redirect.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ diff --git a/src/src/setenv.c b/src/src/setenv.c index 18d1519b6..ceeb8ef1c 100644 --- a/src/src/setenv.c +++ b/src/src/setenv.c @@ -2,8 +2,9 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2015 */ -/* Copyright (c) Jeremy Harris 2015 - 2016 */ +/* Copyright (c) Michael Haardt 2015 + * Copyright (c) Jeremy Harris 2015 - 2016 + * Copyright (c) The Exim Maintainers 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* This module provides (un)setenv routines for those environments diff --git a/src/src/sieve.c b/src/src/sieve.c index 8f98aebab..5d072f855 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2003 - 2015 */ -/* See the file NOTICE for conditions of use and distribution. */ +/* Copyright (c) Michael Haardt 2003 - 2015 + * Copyright (c) The Exim Maintainers 2016 + * See the file NOTICE for conditions of use and distribution. + */ /* This code was contributed by Michael Haardt. */ diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 98968f95d..86d566dc9 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 06bc1dfd3..6b4843175 100644 --- a/src/src/smtp_out.c +++ b/src/src/smtp_out.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 8898c591e..f46e11e42 100644 --- a/src/src/spam.c +++ b/src/src/spam.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2003 - 2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2003 - 2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ /* Code for calling spamassassin's spamd. Called from acl.c. */ diff --git a/src/src/spf.c b/src/src/spf.c index 2a9dcb78e..9ab56af23 100644 --- a/src/src/spf.c +++ b/src/src/spf.c @@ -4,7 +4,9 @@ /* Experimental SPF support. Copyright (c) Tom Kistner 2004 - 2014 - License: GPL */ + License: GPL + Copyright (c) The Exim Maintainers 2016 +*/ /* 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 3d5f621fd..2a7c04094 100644 --- a/src/src/spf.h +++ b/src/src/spf.h @@ -4,13 +4,15 @@ /* Experimental SPF support. Copyright (c) Tom Kistner 2004 - License: GPL */ + License: GPL + Copyright (c) The Exim Maintainers 2016 +*/ #ifdef EXPERIMENTAL_SPF /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */ #ifndef HAVE_NS_TYPE -#define HAVE_NS_TYPE +# define HAVE_NS_TYPE #endif #include diff --git a/src/src/spool_in.c b/src/src/spool_in.c index 5100eeb30..085437212 100644 --- a/src/src/spool_in.c +++ b/src/src/spool_in.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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_mbox.c b/src/src/spool_mbox.c index 95e71b9c9..357eba9da 100644 --- a/src/src/spool_mbox.c +++ b/src/src/spool_mbox.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner 2003 - 2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner 2003 - 2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ /* Code for setting up a MBOX style spool file inside a /scan/ sub directory of exim's spool directory. */ diff --git a/src/src/spool_out.c b/src/src/spool_out.c index ad12d1a94..e960907db 100644 --- a/src/src/spool_out.c +++ b/src/src/spool_out.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for writing spool files, and moving them about. */ diff --git a/src/src/srs.c b/src/src/srs.c index 4fac22604..1ff391f65 100644 --- a/src/src/srs.c +++ b/src/src/srs.c @@ -4,6 +4,7 @@ /* SRS - Sender rewriting scheme support (C)2004 Miles Wilton + Copyright (c) The Exim Maintainers 2016 SRS Support Version: 1.0a diff --git a/src/src/store.c b/src/src/store.c index 9c1d1d83f..88b1fd88f 100644 --- a/src/src/store.c +++ b/src/src/store.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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/string.c b/src/src/string.c index 4ef6a3773..db54a094b 100644 --- a/src/src/string.c +++ b/src/src/string.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Miscellaneous string-handling functions. Some are not required for diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index 85ba2e5bd..942f73eac 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 858caa227..be9377665 100644 --- a/src/src/tls.c +++ b/src/src/tls.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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-openssl.c b/src/src/tlscert-openssl.c index 82f04955e..690f95081 100644 --- a/src/src/tlscert-openssl.c +++ b/src/src/tlscert-openssl.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Jeremy Harris 2014 - 2015 */ +/* Copyright (c) Jeremy Harris 2014 - 2016 */ /* This module provides TLS (aka SSL) support for Exim using the OpenSSL library. It is #included into the tls.c file when that library is used. diff --git a/src/src/transport.c b/src/src/transport.c index 6b72521e5..8ac6f30a0 100644 --- a/src/src/transport.c +++ b/src/src/transport.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 3a53c3d42..5dc4ee9b5 100644 --- a/src/src/transports/appendfile.c +++ b/src/src/transports/appendfile.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 e93267e48..54f9ef4de 100644 --- a/src/src/transports/autoreply.c +++ b/src/src/transports/autoreply.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 7c091cb59..bca597893 100644 --- a/src/src/transports/lmtp.c +++ b/src/src/transports/lmtp.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 7b340e21b..7bf11b830 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" diff --git a/src/src/verify.c b/src/src/verify.c index 6c36be371..2634e7552 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions concerned with verifying things. The original code for callout -- 2.30.2