From 4a0b9e747c8abfca24f30b7ce1e9a725ce11474a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 3 Jun 2018 15:36:21 -0700 Subject: Add SPDX-License-Identifier headers Add SPDX-License-Identifier headers to all substantial source files. Collapse copyright years. Add some Emacs configuration for files where the copyright notice is at the end. Add a test that every file has SPDX-License-Identifier. --- client/file.c | 4 ++-- client/internal.h | 2 +- client/keytab.c | 4 ++-- client/krb5.c | 4 ++-- client/options.c | 2 +- client/remctl.c | 2 +- client/srvtab.c | 2 +- client/wallet-rekey.c | 2 +- client/wallet-rekey.pod | 4 +++- client/wallet.c | 2 +- client/wallet.pod | 7 +++++-- 11 files changed, 20 insertions(+), 15 deletions(-) (limited to 'client') diff --git a/client/file.c b/client/file.c index 468eb30..809e78b 100644 --- a/client/file.c +++ b/client/file.c @@ -2,10 +2,10 @@ * File handling for the wallet client. * * Written by Russ Allbery - * Copyright 2007, 2008, 2010 + * Copyright 2007-2008, 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/internal.h b/client/internal.h index 7f58e33..1aed874 100644 --- a/client/internal.h +++ b/client/internal.h @@ -6,7 +6,7 @@ * Copyright 2007-2008, 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #ifndef CLIENT_INTERNAL_H diff --git a/client/keytab.c b/client/keytab.c index 7bec459..ed1bdb9 100644 --- a/client/keytab.c +++ b/client/keytab.c @@ -2,10 +2,10 @@ * Implementation of keytab handling for the wallet client. * * Written by Russ Allbery - * Copyright 2007, 2008, 2010, 2013, 2014 + * Copyright 2007-2008, 2010, 2013-2014 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/krb5.c b/client/krb5.c index 345df64..f0c0ff1 100644 --- a/client/krb5.c +++ b/client/krb5.c @@ -6,10 +6,10 @@ * client. * * Written by Russ Allbery - * Copyright 2007, 2008, 2010 + * Copyright 2007-2008, 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/options.c b/client/options.c index f011b79..7b1f04e 100644 --- a/client/options.c +++ b/client/options.c @@ -9,7 +9,7 @@ * Copyright 2006-2008, 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/remctl.c b/client/remctl.c index d4cd09e..26d7e8f 100644 --- a/client/remctl.c +++ b/client/remctl.c @@ -5,7 +5,7 @@ * Copyright 2007, 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/srvtab.c b/client/srvtab.c index 045f56d..2b600c2 100644 --- a/client/srvtab.c +++ b/client/srvtab.c @@ -5,7 +5,7 @@ * Copyright 2007, 2008, 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/wallet-rekey.c b/client/wallet-rekey.c index caab130..2aedf57 100644 --- a/client/wallet-rekey.c +++ b/client/wallet-rekey.c @@ -7,7 +7,7 @@ * Copyright 2010 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/wallet-rekey.pod b/client/wallet-rekey.pod index e4c01b3..d76420f 100644 --- a/client/wallet-rekey.pod +++ b/client/wallet-rekey.pod @@ -1,6 +1,6 @@ =for stopwords wallet-rekey rekey rekeying keytab -hv Heimdal remctl remctld PKINIT kinit -appdefaults Allbery kadmin +appdefaults Allbery kadmin SPDX-License-Identifier FSFAP =head1 NAME @@ -161,6 +161,8 @@ 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 + =head1 SEE ALSO kadmin(8), kinit(1), krb5.conf(5), remctl(1), remctld(8), wallet(1) diff --git a/client/wallet.c b/client/wallet.c index 5a80876..194f1f5 100644 --- a/client/wallet.c +++ b/client/wallet.c @@ -6,7 +6,7 @@ * Copyright 2006-2008, 2010, 2014 * The Board of Trustees of the Leland Stanford Junior University * - * See LICENSE for licensing terms. + * SPDX-License-Identifier: MIT */ #include diff --git a/client/wallet.pod b/client/wallet.pod index 2033fec..63336db 100644 --- a/client/wallet.pod +++ b/client/wallet.pod @@ -2,6 +2,7 @@ -hv srvtab arg keytabs metadata keytab ACL PTS kinit klist remctl PKINIT acl timestamp autocreate backend-specific setacl enctypes enctype ktadd KDC appdefaults remctld Allbery uuencode getacl backend ACL's DES +SPDX-License-Identifier FSFAP =head1 NAME @@ -487,14 +488,16 @@ Russ Allbery =head1 COPYRIGHT AND LICENSE -Copyright 2007, 2008, 2010, 2011, 2012, 2013 The Board of Trustees of the -Leland Stanford Junior University +Copyright 2007-2008, 2010-2013 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 + =head1 SEE ALSO kadmin(8), kinit(1), krb5.conf(5), remctl(1), remctld(8) -- cgit v1.2.3