Add SPDX-License-Identifier

Add SPDX-License-Identifier headers to all substantial source files.
Also canonicalize copyright date formats and fix a few copyright
notices that weren't in my standard layout.

50 files changed, 203 insertions, 89 deletions

diff --git a/tests/client/api-t.c b/tests/client/api-t.c
index 6a8a9fc..a721312 100644
--- a/tests/client/api-t.c
+++ b/tests/client/api-t.c
@@ -2,10 +2,10 @@
  * Test suite for the high-level remctl library API.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2007, 2009, 2010, 2011, 2012, 2013
+ * Copyright 2006-2007, 2009-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/client/ccache-t.c b/tests/client/ccache-t.c
index ca19f3d..132cb56 100644
--- a/tests/client/ccache-t.c
+++ b/tests/client/ccache-t.c
@@ -2,10 +2,10 @@
  * Test suite for setting a specific Kerberos credential cache.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2011, 2012, 2013, 2014
+ * Copyright 2011-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/client/large-t.c b/tests/client/large-t.c
index c0ee760..fb75076 100644
--- a/tests/client/large-t.c
+++ b/tests/client/large-t.c
@@ -2,10 +2,10 @@
  * Test suite for over-large commands.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2007, 2009, 2010, 2012
+ * Copyright 2007, 2009-2010, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/client/open-t.c b/tests/client/open-t.c
index 49fdf48..0dcf909 100644
--- a/tests/client/open-t.c
+++ b/tests/client/open-t.c
@@ -2,10 +2,10 @@
  * Test suite for the client connection negotiation code.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2007, 2009, 2010, 2012, 2014
+ * Copyright 2006-2007, 2009-2010, 2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/client/remctl-t b/tests/client/remctl-t
index cd94c42..65b9741 100755
--- a/tests/client/remctl-t
+++ b/tests/client/remctl-t
@@ -4,10 +4,10 @@
 #
 # Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2016 Russ Allbery <eagle@eyrie.org>
-# Copyright 2006, 2007, 2009, 2011, 2012, 2014
+# Copyright 2006-2007, 2009, 2011-2012, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 . "${C_TAP_SOURCE}/tap/libtap.sh"
 . "${C_TAP_SOURCE}/tap/kerberos.sh"
diff --git a/tests/client/source-ip-t.c b/tests/client/source-ip-t.c
index 5767a69..adf2994 100644
--- a/tests/client/source-ip-t.c
+++ b/tests/client/source-ip-t.c
@@ -2,10 +2,10 @@
  * Test suite for setting a source IP for the client.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2011, 2012
+ * Copyright 2011-2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/client/timeout-t.c b/tests/client/timeout-t.c
index c4fcfdb..a4e85e6 100644
--- a/tests/client/timeout-t.c
+++ b/tests/client/timeout-t.c
@@ -5,7 +5,7 @@
  * Copyright 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/acl-too-long b/tests/data/acl-too-long
index 90445db..86e22d4 100644
--- a/tests/data/acl-too-long
+++ b/tests/data/acl-too-long
@@ -7,3 +7,5 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
+#
+# SPDX-License-Identifier: FSFAP
diff --git a/tests/data/cmd-background.c b/tests/data/cmd-background.c
index d5b1abc..518020c 100644
--- a/tests/data/cmd-background.c
+++ b/tests/data/cmd-background.c
@@ -8,7 +8,7 @@
  * Copyright 2007, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/cmd-closed.c b/tests/data/cmd-closed.c
index 26e1d9c..2274341 100644
--- a/tests/data/cmd-closed.c
+++ b/tests/data/cmd-closed.c
@@ -3,10 +3,10 @@
  * on any read and that all file descriptors higher than 2 are closed.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2007, 2008
+ * Copyright 2007-2008
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/cmd-large-output.c b/tests/data/cmd-large-output.c
index 3fa4b2d..3ac0f9f 100644
--- a/tests/data/cmd-large-output.c
+++ b/tests/data/cmd-large-output.c
@@ -7,7 +7,7 @@
  * Copyright 2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/cmd-sigpipe.c b/tests/data/cmd-sigpipe.c
index 60bf623..879d135 100644
--- a/tests/data/cmd-sigpipe.c
+++ b/tests/data/cmd-sigpipe.c
@@ -7,7 +7,7 @@
  * Copyright 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/cmd-stdin.c b/tests/data/cmd-stdin.c
index 0bfbfcd..868bd1f 100644
--- a/tests/data/cmd-stdin.c
+++ b/tests/data/cmd-stdin.c
@@ -16,7 +16,7 @@
  * Copyright 2009-2010
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/cmd-streaming.c b/tests/data/cmd-streaming.c
index 92587fc..835c39a 100644
--- a/tests/data/cmd-streaming.c
+++ b/tests/data/cmd-streaming.c
@@ -6,7 +6,7 @@
  * Copyright 2006
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/cmd-user.c b/tests/data/cmd-user.c
index 6061356..b4f1825 100644
--- a/tests/data/cmd-user.c
+++ b/tests/data/cmd-user.c
@@ -5,7 +5,7 @@
  * Copyright 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/data/conf-simple.in b/tests/data/conf-simple.in
index 1337eb4..1da1a02 100644
--- a/tests/data/conf-simple.in
+++ b/tests/data/conf-simple.in
@@ -23,10 +23,12 @@ ALL bar @abs_top_srcdir@/tests/data/cmd-hello ANYUSER
 
 # Copyright 2016 Russ Allbery <eagle@eyrie.org>
 # Copyright 2016 Dropbox, Inc.
-# Copyright 2013, 2014
+# Copyright 2013-2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
+#
+# SPDX-License-Identifier: FSFAP
diff --git a/tests/data/conf-test b/tests/data/conf-test
index f6258e2..d47991b 100644
--- a/tests/data/conf-test
+++ b/tests/data/conf-test
@@ -5,7 +5,7 @@
 # Copyright 2007, 2012
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 
   test \
diff --git a/tests/data/fake-sudo b/tests/data/fake-sudo
index 3f4f3f1..84868e8 100755
--- a/tests/data/fake-sudo
+++ b/tests/data/fake-sudo
@@ -8,7 +8,7 @@
 # Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2016 Dropbox, Inc.
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 set -e
 
diff --git a/tests/docs/spdx-license-t b/tests/docs/spdx-license-t
new file mode 100755
index 0000000..8cffdeb
--- /dev/null
+++ b/tests/docs/spdx-license-t
@@ -0,0 +1,130 @@
+#!/usr/bin/perl
+#
+# Check source files for SPDX-License-Identifier fields.
+#
+# Examine all source files in a distribution to check that they contain an
+# SPDX-License-Identifier field.  This does not check the syntax or whether
+# the identifiers are valid.
+#
+# The canonical version of this file is maintained in the rra-c-util package,
+# which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
+#
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# SPDX-License-Identifier: MIT
+
+use 5.006;
+use strict;
+use warnings;
+
+use lib "$ENV{C_TAP_SOURCE}/tap/perl";
+
+use File::Basename qw(basename);
+use Test::More;
+use Test::RRA qw(skip_unless_automated);
+use Test::RRA::Automake qw(all_files automake_setup);
+
+# File name (the file without any directory component) and path patterns to
+# skip for this check.
+## no critic (RegularExpressions::ProhibitFixedStringMatches)
+my @IGNORE = (
+    qr{ \A LICENSE \z }xms,            # Generated file with no license itself
+    qr{ \A (NEWS|THANKS|TODO) \z }xms, # Package license should be fine
+    qr{ \A README ( [.] .* )? \z }xms, # Package license should be fine
+    qr{ \A (Makefile|libtool) \z }xms, # Generated file
+    qr{ [.] output \z }xms,            # Test data
+);
+my @IGNORE_PATHS = (
+    qr{ \A docs/metadata/ }xms,                # Package license should be fine
+    qr{ \A docs/protocol[.](html|txt) \z }xms, # Generated by xml2rfc
+    qr{ \A m4/ (libtool|lt.*) [.] m4 \z }xms,  # Files from Libtool
+    qr{ \A perl/Build \z }xms,                 # Perl build files
+    qr{ \A perl/MYMETA [.] }xms,               # Perl build files
+    qr{ \A perl/blib/ }xms,                    # Perl build files
+    qr{ \A perl/_build }xms,                   # Perl build files
+    qr{ \A php/Makefile [.] global \z }xms,    # Created by phpize
+    qr{ \A php/autom4te [.] cache/ }xms,       # Created by phpize
+    qr{ \A php/acinclude [.] m4 \z }xms,       # Created by phpize
+    qr{ \A php/build/ }xms,                    # Created by phpize
+    qr{ \A php/config [.] (guess|sub) \z }xms, # Created by phpize
+    qr{ \A php/configure [.] in \z }xms,       # Created by phpize
+    qr{ \A php/ltmain [.] sh \z }xms,          # Created by phpize
+    qr{ \A php/run-tests [.] php \z }xms,      # Created by phpize
+);
+## use critic
+
+# Only run this test during automated testing, since failure doesn't indicate
+# any user-noticable flaw in the package itself.
+skip_unless_automated('SPDX license identifier tests');
+
+# Set up Automake testing.
+automake_setup();
+
+# Check a single file for an occurrence of the string.
+#
+# $path - Path to the file
+#
+# Returns: undef
+sub check_file {
+    my ($path) = @_;
+    my $filename = basename($path);
+
+    # Ignore files in the whitelist, binary files, and files under 1KB.  The
+    # latter can be rolled up into the overall project license and the license
+    # notice may be a substantial portion of the file size.
+    for my $pattern (@IGNORE) {
+        return if $filename =~ $pattern;
+    }
+    for my $pattern (@IGNORE_PATHS) {
+        return if $path =~ $pattern;
+    }
+    return if !-T $path;
+    return if -s $path < 1024;
+
+    # Scan the file.
+    my ($saw_spdx, $skip_spdx);
+    open(my $file, '<', $path) or BAIL_OUT("Cannot open $path");
+    while (defined(my $line = <$file>)) {
+        if ($line =~ m{ Generated [ ] by [ ] libtool [ ] }xms) {
+            close($file);
+            return;
+        }
+        if ($line =~ m{ \b SPDX-License-Identifier: \s+ \S+ }xms) {
+            $saw_spdx = 1;
+            last;
+        }
+        if ($line =~ m{ no \s SPDX-License-Identifier \s registered }xms) {
+            $skip_spdx = 1;
+            last;
+        }
+    }
+    close($file) or BAIL_OUT("Cannot close $path");
+    ok($saw_spdx || $skip_spdx, $path);
+    return;
+}
+
+# Scan every file.  We don't declare a plan since we skip a lot of files and
+# don't want to precalculate the file list.
+my @paths = all_files();
+for my $path (@paths) {
+    check_file($path);
+}
+done_testing();
diff --git a/tests/server/accept-t.c b/tests/server/accept-t.c
index 4cba772..0521aec 100644
--- a/tests/server/accept-t.c
+++ b/tests/server/accept-t.c
@@ -2,10 +2,10 @@
  * Test suite for the server connection negotiation code.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2007, 2009, 2010, 2012, 2014
+ * Copyright 2006-2007, 2009-2010, 2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/acl-t.c b/tests/server/acl-t.c
index 0e0ac3c..534c670 100644
--- a/tests/server/acl-t.c
+++ b/tests/server/acl-t.c
@@ -2,13 +2,13 @@
  * Test suite for the server ACL checking.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
+ * Copyright 2015-2016, 2018 Russ Allbery <eagle@eyrie.org>
  * Copyright 2016 Dropbox, Inc.
- * Copyright 2015, 2016, 2018 Russ Allbery <eagle@eyrie.org>
- * Copyright 2007, 2008, 2009, 2010, 2012, 2014
+ * Copyright 2007-2010, 2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 2008 Carnegie Mellon University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/acl/fake-getgrnam.c b/tests/server/acl/fake-getgrnam.c
index e2541a2..1f84ed2 100644
--- a/tests/server/acl/fake-getgrnam.c
+++ b/tests/server/acl/fake-getgrnam.c
@@ -7,12 +7,11 @@
  * caller to fake a syscall failure to exercise failure behavior.
  *
  * Written by Remi Ferrand <remi.ferrand@cc.in2p3.fr>
- * Revisions by Russ Allbery <eagle@eyrie.org>
  * Copyright 2014 IN2P3 Computing Centre - CNRS
  * Copyright 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/acl/fake-getgrnam.h b/tests/server/acl/fake-getgrnam.h
index 6ef9ff4..bfd5b9b 100644
--- a/tests/server/acl/fake-getgrnam.h
+++ b/tests/server/acl/fake-getgrnam.h
@@ -2,12 +2,11 @@
  * Testing interface to the fake getgrnam_r replacement.
  *
  * Written by Remi Ferrand <remi.ferrand@cc.in2p3.fr>
- * Revisions by Russ Allbery <eagle@eyrie.org>
  * Copyright 2014 IN2P3 Computing Centre - CNRS
  * Copyright 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
  
 #ifndef TESTS_SERVER_ACL_FAKE_GETGRNAM_H
diff --git a/tests/server/acl/fake-getpwnam.c b/tests/server/acl/fake-getpwnam.c
index b259778..9a657aa 100644
--- a/tests/server/acl/fake-getpwnam.c
+++ b/tests/server/acl/fake-getpwnam.c
@@ -12,7 +12,7 @@
  * Copyright 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/acl/fake-getpwnam.h b/tests/server/acl/fake-getpwnam.h
index 49b8c5e..9b09bd1 100644
--- a/tests/server/acl/fake-getpwnam.h
+++ b/tests/server/acl/fake-getpwnam.h
@@ -5,7 +5,7 @@
  * Copyright 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TESTS_SERVER_ACL_FAKE_GETPWNAM_H
diff --git a/tests/server/acl/localgroup-t.c b/tests/server/acl/localgroup-t.c
index f7157f0..3c8e1ee 100644
--- a/tests/server/acl/localgroup-t.c
+++ b/tests/server/acl/localgroup-t.c
@@ -9,7 +9,7 @@
  * Copyright 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/anonymous-t.c b/tests/server/anonymous-t.c
index b3acf9b..29b1433 100644
--- a/tests/server/anonymous-t.c
+++ b/tests/server/anonymous-t.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2015-2016, 2018 Russ Allbery <eagle@eyrie.org>
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/bind-t.c b/tests/server/bind-t.c
index a487d28..1be545f 100644
--- a/tests/server/bind-t.c
+++ b/tests/server/bind-t.c
@@ -6,7 +6,7 @@
  * Copyright 2011-2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/config-t.c b/tests/server/config-t.c
index 6959f47..f913bb7 100644
--- a/tests/server/config-t.c
+++ b/tests/server/config-t.c
@@ -2,10 +2,10 @@
  * Test suite for the server configuration parsing.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2007, 2009, 2010, 2011, 2012, 2013, 2014
+ * Copyright 2007, 2009-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/continue-t.c b/tests/server/continue-t.c
index 132eacc..83652e8 100644
--- a/tests/server/continue-t.c
+++ b/tests/server/continue-t.c
@@ -6,7 +6,7 @@
  * Copyright 2006, 2009-2010, 2012-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/empty-t.c b/tests/server/empty-t.c
index ff8d7f3..c4bec51 100644
--- a/tests/server/empty-t.c
+++ b/tests/server/empty-t.c
@@ -5,7 +5,7 @@
  * Copyright 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/env-t.c b/tests/server/env-t.c
index b256cda..2378371 100644
--- a/tests/server/env-t.c
+++ b/tests/server/env-t.c
@@ -6,7 +6,7 @@
  * Copyright 2006, 2009-2010, 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/errors-t.c b/tests/server/errors-t.c
index 6a75ddf..4af88e8 100644
--- a/tests/server/errors-t.c
+++ b/tests/server/errors-t.c
@@ -2,10 +2,10 @@
  * Test suite for errors returned by the server.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2007, 2009, 2010, 2012, 2014
+ * Copyright 2006-2007, 2009-2010, 2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/help-t.c b/tests/server/help-t.c
index 107d658..f57f90a 100644
--- a/tests/server/help-t.c
+++ b/tests/server/help-t.c
@@ -2,10 +2,10 @@
  * Test suite for the server using the summary command.
  *
  * Written by Jon Robertson <jonrober@stanford.edu>
- * Copyright 2012, 2013
+ * Copyright 2012-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/invalid-t.c b/tests/server/invalid-t.c
index ad3475a..836ad9a 100644
--- a/tests/server/invalid-t.c
+++ b/tests/server/invalid-t.c
@@ -2,10 +2,10 @@
  * Test suite for malformed commands.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2007, 2009, 2010, 2012, 2013
+ * Copyright 2007, 2009-2010, 2012-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/logging-t.c b/tests/server/logging-t.c
index b2c82cc..d66a9b8 100644
--- a/tests/server/logging-t.c
+++ b/tests/server/logging-t.c
@@ -2,10 +2,10 @@
  * Test suite for server command logging.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2009, 2010, 2012, 2014
+ * Copyright 2009-2010, 2012, 2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/misc-t b/tests/server/misc-t
index 9afc30a..28d5816 100755
--- a/tests/server/misc-t
+++ b/tests/server/misc-t
@@ -3,10 +3,10 @@
 # Test suite for various server functions.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2006, 2007, 2009, 2012, 2014
+# Copyright 2006-2007, 2009, 2012, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 . "${C_TAP_SOURCE}/tap/libtap.sh"
 . "${C_TAP_SOURCE}/tap/kerberos.sh"
diff --git a/tests/server/noop-t.c b/tests/server/noop-t.c
index 914c56c..882f1ba 100644
--- a/tests/server/noop-t.c
+++ b/tests/server/noop-t.c
@@ -2,10 +2,10 @@
  * Test suite for no-op messages in the server.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2011, 2012, 2013
+ * Copyright 2011-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/shell-misc-t b/tests/server/shell-misc-t
index a5cbda1..289604b 100755
--- a/tests/server/shell-misc-t
+++ b/tests/server/shell-misc-t
@@ -6,7 +6,7 @@
 # Copyright 2016 Russ Allbery <eagle@eyrie.org>
 # Copyright 2016 Dropbox, Inc.
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 . "${C_TAP_SOURCE}/tap/libtap.sh"
 
diff --git a/tests/server/ssh-parse-t.c b/tests/server/ssh-parse-t.c
index 28c7a23..886884b 100644
--- a/tests/server/ssh-parse-t.c
+++ b/tests/server/ssh-parse-t.c
@@ -4,7 +4,7 @@
  * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2016 Dropbox, Inc.
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/stdin-t.c b/tests/server/stdin-t.c
index 856a0fa..7fcff2d 100644
--- a/tests/server/stdin-t.c
+++ b/tests/server/stdin-t.c
@@ -6,7 +6,7 @@
  * Copyright 2009-2010, 2012-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/streaming-t.c b/tests/server/streaming-t.c
index 2c28222..163119b 100644
--- a/tests/server/streaming-t.c
+++ b/tests/server/streaming-t.c
@@ -2,10 +2,10 @@
  * Test suite for streaming data from the server.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2009, 2010, 2012, 2013, 2014
+ * Copyright 2006, 2009-2010, 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/sudo-t.c b/tests/server/sudo-t.c
index 8196db5..568181e 100644
--- a/tests/server/sudo-t.c
+++ b/tests/server/sudo-t.c
@@ -4,7 +4,7 @@
  * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2016 Dropbox, Inc.
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/summary-t.c b/tests/server/summary-t.c
index 5a075a8..80ffccb 100644
--- a/tests/server/summary-t.c
+++ b/tests/server/summary-t.c
@@ -3,10 +3,10 @@
  *
  * Written by Jon Robertson <jonrober@stanford.edu>
  * Copyright 2016 Russ Allbery <eagle@eyrie.org>
- * Copyright 2012, 2013, 2014
+ * Copyright 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/user-t.c b/tests/server/user-t.c
index 2799c93..f779ce1 100644
--- a/tests/server/user-t.c
+++ b/tests/server/user-t.c
@@ -6,7 +6,7 @@
  * Copyright 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/server/version-t.c b/tests/server/version-t.c
index 500213c..8916a95 100644
--- a/tests/server/version-t.c
+++ b/tests/server/version-t.c
@@ -2,10 +2,10 @@
  * Test suite for version negotiation in the server.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2007, 2009, 2010, 2012, 2013
+ * Copyright 2006-2007, 2009-2010, 2012-2013
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/util/faketoken.c b/tests/util/faketoken.c
index 270e579..3a1611f 100644
--- a/tests/util/faketoken.c
+++ b/tests/util/faketoken.c
@@ -6,7 +6,7 @@
  * Copyright 2006, 2009-2010, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/util/faketoken.h b/tests/util/faketoken.h
index ac96aa0..e86c1df 100644
--- a/tests/util/faketoken.h
+++ b/tests/util/faketoken.h
@@ -6,24 +6,6 @@
  *
  * Copyright 2018 Russ Allbery <eagle@eyrie.org>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
  * SPDX-License-Identifier: MIT
  */
 
diff --git a/tests/util/gss-tokens-t.c b/tests/util/gss-tokens-t.c
index e3d8a11..8111bcd 100644
--- a/tests/util/gss-tokens-t.c
+++ b/tests/util/gss-tokens-t.c
@@ -6,7 +6,7 @@
  * Copyright 2006-2007, 2009-2010, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>
diff --git a/tests/util/tokens-t.c b/tests/util/tokens-t.c
index 5bf0f18..3f2f613 100644
--- a/tests/util/tokens-t.c
+++ b/tests/util/tokens-t.c
@@ -1,11 +1,11 @@
 /*
- * tokens test suite.
+ * Token utility function test suite.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2006, 2007, 2009, 2010, 2012, 2013, 2014
+ * Copyright 2006-2007, 2009-2010, 2012-2014
  *     The Board of Trustees of the Leland Stanford Junior University
  *
- * See LICENSE for licensing terms.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <config.h>