diff --git a/Makefile.in b/Makefile.in index 4e11e58a0..d50b18450 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2010-2015, 2017-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/configure.ac b/configure.ac index d0a900836..451ab1e25 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,21 @@ dnl dnl Use the top-level autogen.sh script to generate configure and config.h.in dnl -dnl Copyright (c) 1994-1996,1998-2018 Todd C. Miller +dnl SPDX-License-Identifier: ISC +dnl +dnl Copyright (c) 1994-1996, 1998-2018 Todd C. Miller +dnl +dnl Permission to use, copy, modify, and distribute this software for any +dnl purpose with or without fee is hereby granted, provided that the above +dnl copyright notice and this permission notice appear in all copies. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. dnl AC_PREREQ([2.59]) AC_INIT([sudo], [1.8.27], [https://bugzilla.sudo.ws/], [sudo]) diff --git a/doc/Makefile.in b/doc/Makefile.in index e8d260554..90c9a8f66 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2010-2015, 2017-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/doc/cvtsudoers.man.in b/doc/cvtsudoers.man.in index 41929eaf1..f1a8e91a9 100644 --- a/doc/cvtsudoers.man.in +++ b/doc/cvtsudoers.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/cvtsudoers.mdoc.in b/doc/cvtsudoers.mdoc.in index ce5d4c3ad..b24f36370 100644 --- a/doc/cvtsudoers.mdoc.in +++ b/doc/cvtsudoers.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/fixman.sh b/doc/fixman.sh index f7ed1a8fc..c22b58c47 100755 --- a/doc/fixman.sh +++ b/doc/fixman.sh @@ -1,5 +1,7 @@ #!/bin/sh # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2012-2014, 2017 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudo.conf.man.in b/doc/sudo.conf.man.in index 8a8a31146..a8b3eb59c 100644 --- a/doc/sudo.conf.man.in +++ b/doc/sudo.conf.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2010-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudo.conf.mdoc.in b/doc/sudo.conf.mdoc.in index 4823a0b6e..5416046c3 100644 --- a/doc/sudo.conf.mdoc.in +++ b/doc/sudo.conf.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2010-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudo.man.in b/doc/sudo.man.in index ffcd4680a..c373db95b 100644 --- a/doc/sudo.man.in +++ b/doc/sudo.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 1994-1996, 1998-2005, 2007-2018 .\" Todd C. Miller .\" diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in index c9b928e0c..ff0610735 100644 --- a/doc/sudo.mdoc.in +++ b/doc/sudo.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 1994-1996, 1998-2005, 2007-2018 .\" Todd C. Miller .\" diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in index c336033b5..09efe263f 100644 --- a/doc/sudo_plugin.man.in +++ b/doc/sudo_plugin.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2009-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in index a293ee3b7..d855acf0a 100644 --- a/doc/sudo_plugin.mdoc.in +++ b/doc/sudo_plugin.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2009-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudoers.ldap.man.in b/doc/sudoers.ldap.man.in index af722bdfb..5791e4c1e 100644 --- a/doc/sudoers.ldap.man.in +++ b/doc/sudoers.ldap.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2003-2019 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudoers.ldap.mdoc.in b/doc/sudoers.ldap.mdoc.in index 75c6667f3..d88d48bea 100644 --- a/doc/sudoers.ldap.mdoc.in +++ b/doc/sudoers.ldap.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2003-2019 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in index 744b79720..d05fbc1fc 100644 --- a/doc/sudoers.man.in +++ b/doc/sudoers.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 1994-1996, 1998-2005, 2007-2019 .\" Todd C. Miller .\" diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in index b22d5810f..3ff8604ff 100644 --- a/doc/sudoers.mdoc.in +++ b/doc/sudoers.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 1994-1996, 1998-2005, 2007-2019 .\" Todd C. Miller .\" diff --git a/doc/sudoers_timestamp.man.in b/doc/sudoers_timestamp.man.in index 86acce454..0c3e509a1 100644 --- a/doc/sudoers_timestamp.man.in +++ b/doc/sudoers_timestamp.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2017-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudoers_timestamp.mdoc.in b/doc/sudoers_timestamp.mdoc.in index b38559067..f8dc956fb 100644 --- a/doc/sudoers_timestamp.mdoc.in +++ b/doc/sudoers_timestamp.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2017-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudoreplay.man.in b/doc/sudoreplay.man.in index 7bb2da6c8..bb6726f92 100644 --- a/doc/sudoreplay.man.in +++ b/doc/sudoreplay.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2009-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/sudoreplay.mdoc.in b/doc/sudoreplay.mdoc.in index 4eefaf689..2642e82bd 100644 --- a/doc/sudoreplay.mdoc.in +++ b/doc/sudoreplay.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 2009-2018 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any diff --git a/doc/visudo.man.in b/doc/visudo.man.in index 9d6fc4877..cfb010248 100644 --- a/doc/visudo.man.in +++ b/doc/visudo.man.in @@ -1,5 +1,7 @@ .\" Automatically generated from an mdoc input file. Do not edit. .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 1996,1998-2005, 2007-2018 .\" Todd C. Miller .\" diff --git a/doc/visudo.mdoc.in b/doc/visudo.mdoc.in index 140d5d6f8..41625ac01 100644 --- a/doc/visudo.mdoc.in +++ b/doc/visudo.mdoc.in @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: ISC +.\" .\" Copyright (c) 1996,1998-2005, 2007-2018 .\" Todd C. Miller .\" diff --git a/examples/Makefile.in b/examples/Makefile.in index bb9e53360..a42c5e406 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2014, 2017-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/include/Makefile.in b/include/Makefile.in index cb39b3625..6bd74d5f2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2011-2015, 2017-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/include/compat/charclass.h b/include/compat/charclass.h index 645e8841b..77c8d7fb3 100644 --- a/include/compat/charclass.h +++ b/include/compat/charclass.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008, 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/compat/endian.h b/include/compat/endian.h index 279549c4c..d3c5ca949 100644 --- a/include/compat/endian.h +++ b/include/compat/endian.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/compat/fnmatch.h b/include/compat/fnmatch.h index fb81e3855..41cd3da89 100644 --- a/include/compat/fnmatch.h +++ b/include/compat/fnmatch.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/compat/getopt.h b/include/compat/getopt.h index 8f4951836..d83577eff 100644 --- a/include/compat/getopt.h +++ b/include/compat/getopt.h @@ -3,6 +3,8 @@ /* $FreeBSD: head/include/getopt.h 203963 2010-02-16 19:28:10Z imp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. * diff --git a/include/compat/glob.h b/include/compat/glob.h index 40f5d39e1..20dd0c58b 100644 --- a/include/compat/glob.h +++ b/include/compat/glob.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/include/compat/nss_dbdefs.h b/include/compat/nss_dbdefs.h index bc3f9b950..849bba447 100644 --- a/include/compat/nss_dbdefs.h +++ b/include/compat/nss_dbdefs.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/compat/sha2.h b/include/compat/sha2.h index 36384230c..463c33ad7 100644 --- a/include/compat/sha2.h +++ b/include/compat/sha2.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_compat.h b/include/sudo_compat.h index a6d5785ef..c987174d5 100644 --- a/include/sudo_compat.h +++ b/include/sudo_compat.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2008, 2009-2018 * Todd C. Miller * diff --git a/include/sudo_conf.h b/include/sudo_conf.h index 66761167b..a8b72beb1 100644 --- a/include/sudo_conf.h +++ b/include/sudo_conf.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_debug.h b/include/sudo_debug.h index 105a7e6f6..522ec5545 100644 --- a/include/sudo_debug.h +++ b/include/sudo_debug.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_digest.h b/include/sudo_digest.h index 9fffa1b4d..dcf97367a 100644 --- a/include/sudo_digest.h +++ b/include/sudo_digest.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_dso.h b/include/sudo_dso.h index 08fd8a8cd..2daf09ab8 100644 --- a/include/sudo_dso.h +++ b/include/sudo_dso.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010, 2013, 2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_event.h b/include/sudo_event.h index 9797d58cd..6cae833a5 100644 --- a/include/sudo_event.h +++ b/include/sudo_event.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015, 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_fatal.h b/include/sudo_fatal.h index ea92b3b6e..3d78e1263 100644 --- a/include/sudo_fatal.h +++ b/include/sudo_fatal.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004, 2010-2015, 2017-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_gettext.h b/include/sudo_gettext.h index a770b0881..16275aba7 100644 --- a/include/sudo_gettext.h +++ b/include/sudo_gettext.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_lbuf.h b/include/sudo_lbuf.h index 8e070631e..4c8178023 100644 --- a/include/sudo_lbuf.h +++ b/include/sudo_lbuf.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007, 2010, 2011, 2013-2015 * Todd C. Miller * diff --git a/include/sudo_plugin.h b/include/sudo_plugin.h index 31d96cc70..bb4d841c3 100644 --- a/include/sudo_plugin.h +++ b/include/sudo_plugin.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_queue.h b/include/sudo_queue.h index f48daf962..f05595779 100644 --- a/include/sudo_queue.h +++ b/include/sudo_queue.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/include/sudo_rand.h b/include/sudo_rand.h index 2e8308551..283ce5f2e 100644 --- a/include/sudo_rand.h +++ b/include/sudo_rand.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/include/sudo_util.h b/include/sudo_util.h index 96cac165d..395dab616 100644 --- a/include/sudo_util.h +++ b/include/sudo_util.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 27b110f65..129e72b48 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2011-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/aix.c b/lib/util/aix.c index 137de231b..b5aa6b648 100644 --- a/lib/util/aix.c +++ b/lib/util/aix.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008, 2010-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/arc4random.c b/lib/util/arc4random.c index 8935d36db..82057acfe 100644 --- a/lib/util/arc4random.c +++ b/lib/util/arc4random.c @@ -1,6 +1,8 @@ /* $OpenBSD: arc4random.c,v 1.54 2015/09/13 08:31:47 guenther Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, David Mazieres * Copyright (c) 2008, Damien Miller * Copyright (c) 2013, Markus Friedl diff --git a/lib/util/arc4random.h b/lib/util/arc4random.h index d6490177e..badb88ad5 100644 --- a/lib/util/arc4random.h +++ b/lib/util/arc4random.h @@ -1,6 +1,8 @@ /* $OpenBSD: arc4random.h,v 1.4 2015/01/15 06:57:18 deraadt Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, David Mazieres * Copyright (c) 2008, Damien Miller * Copyright (c) 2013, Markus Friedl diff --git a/lib/util/arc4random_uniform.c b/lib/util/arc4random_uniform.c index 51f47147f..bef2ae87c 100644 --- a/lib/util/arc4random_uniform.c +++ b/lib/util/arc4random_uniform.c @@ -1,6 +1,8 @@ /* $OpenBSD: arc4random_uniform.c,v 1.2 2015/09/13 08:31:47 guenther Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008, Damien Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/closefrom.c b/lib/util/closefrom.c index 7f773a2e1..80fdfa46f 100644 --- a/lib/util/closefrom.c +++ b/lib/util/closefrom.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2007, 2010, 2012-2015, 2017-2018 * Todd C. Miller * diff --git a/lib/util/digest.c b/lib/util/digest.c index f81d463ae..8c6b75693 100644 --- a/lib/util/digest.c +++ b/lib/util/digest.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/digest_gcrypt.c b/lib/util/digest_gcrypt.c index 7d12fe2e7..179dd6d25 100644 --- a/lib/util/digest_gcrypt.c +++ b/lib/util/digest_gcrypt.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/digest_openssl.c b/lib/util/digest_openssl.c index af096844a..4224ad0cd 100644 --- a/lib/util/digest_openssl.c +++ b/lib/util/digest_openssl.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/event.c b/lib/util/event.c index 05b3fd00b..42d876339 100644 --- a/lib/util/event.c +++ b/lib/util/event.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/event_poll.c b/lib/util/event_poll.c index 22cda2413..5f45ec601 100644 --- a/lib/util/event_poll.c +++ b/lib/util/event_poll.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/event_select.c b/lib/util/event_select.c index a7336331d..3273b3e0e 100644 --- a/lib/util/event_select.c +++ b/lib/util/event_select.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/fatal.c b/lib/util/fatal.c index 645b59082..8dd690f2f 100644 --- a/lib/util/fatal.c +++ b/lib/util/fatal.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2010-2015, 2017-2018 * Todd C. Miller * diff --git a/lib/util/fnmatch.c b/lib/util/fnmatch.c index 3526fdab3..87731d002 100644 --- a/lib/util/fnmatch.c +++ b/lib/util/fnmatch.c @@ -1,6 +1,9 @@ /* $OpenBSD: fnmatch.c,v 1.15 2011/02/10 21:31:59 stsp Exp $ */ -/* Copyright (c) 2011, VMware, Inc. +/* + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 2011, VMware, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,6 +30,8 @@ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008, 2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/getcwd.c b/lib/util/getcwd.c index b7f2012b8..7c0eaa703 100644 --- a/lib/util/getcwd.c +++ b/lib/util/getcwd.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1989, 1991, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/lib/util/getdelim.c b/lib/util/getdelim.c index 2fe79ce1d..e92a082e0 100644 --- a/lib/util/getdelim.c +++ b/lib/util/getdelim.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/getentropy.c b/lib/util/getentropy.c index bfd7dcd82..dc00d36b5 100644 --- a/lib/util/getentropy.c +++ b/lib/util/getentropy.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014 Theo de Raadt * Copyright (c) 2014 Bob Beck * diff --git a/lib/util/getgrouplist.c b/lib/util/getgrouplist.c index aff795be0..91d398e2f 100644 --- a/lib/util/getgrouplist.c +++ b/lib/util/getgrouplist.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010, 2011, 2013-2018 * Todd C. Miller * diff --git a/lib/util/gethostname.c b/lib/util/gethostname.c index ed5061c28..358941519 100644 --- a/lib/util/gethostname.c +++ b/lib/util/gethostname.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/getopt_long.c b/lib/util/getopt_long.c index d88c3a574..ff4ce32e3 100644 --- a/lib/util/getopt_long.c +++ b/lib/util/getopt_long.c @@ -3,6 +3,8 @@ /* $FreeBSD: head/lib/libc/stdlib/getopt_long.c 236936 2012-06-11 22:25:20Z delphij $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2002 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/gettime.c b/lib/util/gettime.c index f4d4664c3..aadb72846 100644 --- a/lib/util/gettime.c +++ b/lib/util/gettime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/gidlist.c b/lib/util/gidlist.c index 1adf9bc3b..85a6b8915 100644 --- a/lib/util/gidlist.c +++ b/lib/util/gidlist.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/glob.c b/lib/util/glob.c index f3a6d57a1..b54b95923 100644 --- a/lib/util/glob.c +++ b/lib/util/glob.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2008-2014 Todd C. Miller * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff --git a/lib/util/inet_ntop.c b/lib/util/inet_ntop.c index f9072c58f..2f719e70f 100644 --- a/lib/util/inet_ntop.c +++ b/lib/util/inet_ntop.c @@ -1,6 +1,9 @@ /* $OpenBSD: inet_ntop.c,v 1.9 2014/02/05 14:20:43 millert Exp $ */ -/* Copyright (c) 1996 by Internet Software Consortium. +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 1996 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/util/inet_pton.c b/lib/util/inet_pton.c index ba3ec6158..bba11b172 100644 --- a/lib/util/inet_pton.c +++ b/lib/util/inet_pton.c @@ -1,6 +1,9 @@ /* $OpenBSD: inet_pton.c,v 1.8 2010/05/06 15:47:14 claudio Exp $ */ -/* Copyright (c) 1996 by Internet Software Consortium. +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 1996 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/util/isblank.c b/lib/util/isblank.c index 54f88a563..4e297c859 100644 --- a/lib/util/isblank.c +++ b/lib/util/isblank.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008, 2010-2011, 2013 * Todd C. Miller * diff --git a/lib/util/key_val.c b/lib/util/key_val.c index 9bbd0436b..e50e42181 100644 --- a/lib/util/key_val.c +++ b/lib/util/key_val.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2012, 2014-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c index 5e4825815..1c95c7cac 100644 --- a/lib/util/lbuf.c +++ b/lib/util/lbuf.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/locking.c b/lib/util/locking.c index 64499e622..e739c13de 100644 --- a/lib/util/locking.c +++ b/lib/util/locking.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007, 2009-2015 * Todd C. Miller * diff --git a/lib/util/memrchr.c b/lib/util/memrchr.c index 225b542a9..a5a1177e8 100644 --- a/lib/util/memrchr.c +++ b/lib/util/memrchr.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007, 2010-2014 * Todd C. Miller * diff --git a/lib/util/memset_s.c b/lib/util/memset_s.c index 3a3a80516..f36c457f5 100644 --- a/lib/util/memset_s.c +++ b/lib/util/memset_s.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/mksiglist.c b/lib/util/mksiglist.c index 6b5d1ca1f..0c5b27a49 100644 --- a/lib/util/mksiglist.c +++ b/lib/util/mksiglist.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2012, 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c index 535ef467d..32e3e17a0 100644 --- a/lib/util/mksigname.c +++ b/lib/util/mksigname.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2012, 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/mktemp.c b/lib/util/mktemp.c index f153924fa..f4da57981 100644 --- a/lib/util/mktemp.c +++ b/lib/util/mktemp.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2001, 2003, 2004, 2008-2011, 2013, 2015, 2017, 2018 * Todd C. Miller * diff --git a/lib/util/nanosleep.c b/lib/util/nanosleep.c index 7c09b5bbb..96082f537 100644 --- a/lib/util/nanosleep.c +++ b/lib/util/nanosleep.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2011, 2013, 2017-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/parseln.c b/lib/util/parseln.c index 09c7fd511..e48b4fbf4 100644 --- a/lib/util/parseln.c +++ b/lib/util/parseln.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007, 2013-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/pipe2.c b/lib/util/pipe2.c index 89a904c47..0be122dfe 100644 --- a/lib/util/pipe2.c +++ b/lib/util/pipe2.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/progname.c b/lib/util/progname.c index ffe946c3f..dbbcb7969 100644 --- a/lib/util/progname.c +++ b/lib/util/progname.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/pw_dup.c b/lib/util/pw_dup.c index 4257adf08..6811f1a1d 100644 --- a/lib/util/pw_dup.c +++ b/lib/util/pw_dup.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2000, 2002, 2012-2014 * Todd C. Miller * diff --git a/lib/util/reallocarray.c b/lib/util/reallocarray.c index ee2ef4ad9..482afb258 100644 --- a/lib/util/reallocarray.c +++ b/lib/util/reallocarray.c @@ -1,5 +1,7 @@ /* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008 Otto Moerbeek * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/atofoo/atofoo_test.c b/lib/util/regress/atofoo/atofoo_test.c index 1ad78ebd6..031a7ed31 100644 --- a/lib/util/regress/atofoo/atofoo_test.c +++ b/lib/util/regress/atofoo/atofoo_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/getdelim/getdelim_test.c b/lib/util/regress/getdelim/getdelim_test.c index 7045d4b71..7c399ddcf 100644 --- a/lib/util/regress/getdelim/getdelim_test.c +++ b/lib/util/regress/getdelim/getdelim_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/getgrouplist/getgrouplist_test.c b/lib/util/regress/getgrouplist/getgrouplist_test.c index 4d44cf2f6..9dff3dc8f 100644 --- a/lib/util/regress/getgrouplist/getgrouplist_test.c +++ b/lib/util/regress/getgrouplist/getgrouplist_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/parse_gids/parse_gids_test.c b/lib/util/regress/parse_gids/parse_gids_test.c index 674bd96af..efe7f6d29 100644 --- a/lib/util/regress/parse_gids/parse_gids_test.c +++ b/lib/util/regress/parse_gids/parse_gids_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/progname/progname_test.c b/lib/util/regress/progname/progname_test.c index 37c5c22f4..4e99feb55 100644 --- a/lib/util/regress/progname/progname_test.c +++ b/lib/util/regress/progname/progname_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/strsplit/strsplit_test.c b/lib/util/regress/strsplit/strsplit_test.c index c9aecdae4..91532dad6 100644 --- a/lib/util/regress/strsplit/strsplit_test.c +++ b/lib/util/regress/strsplit/strsplit_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c index 534b1df09..e7539ddd1 100644 --- a/lib/util/regress/sudo_conf/conf_test.c +++ b/lib/util/regress/sudo_conf/conf_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/sudo_parseln/parseln_test.c b/lib/util/regress/sudo_parseln/parseln_test.c index ac46dd8dd..68d984b26 100644 --- a/lib/util/regress/sudo_parseln/parseln_test.c +++ b/lib/util/regress/sudo_parseln/parseln_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/tailq/hltq_test.c b/lib/util/regress/tailq/hltq_test.c index 5333a15d1..3a89f3f37 100644 --- a/lib/util/regress/tailq/hltq_test.c +++ b/lib/util/regress/tailq/hltq_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/regress/vsyslog/vsyslog_test.c b/lib/util/regress/vsyslog/vsyslog_test.c index 80d5768b9..0ad07378b 100644 --- a/lib/util/regress/vsyslog/vsyslog_test.c +++ b/lib/util/regress/vsyslog/vsyslog_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/secure_path.c b/lib/util/secure_path.c index b1d4415c8..4ca8bbcb6 100644 --- a/lib/util/secure_path.c +++ b/lib/util/secure_path.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012, 2014-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/setgroups.c b/lib/util/setgroups.c index 9b81456ce..3e34be04c 100644 --- a/lib/util/setgroups.c +++ b/lib/util/setgroups.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2012, 2014-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/sha2.c b/lib/util/sha2.c index 9a172e309..0a070185e 100644 --- a/lib/util/sha2.c +++ b/lib/util/sha2.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/sig2str.c b/lib/util/sig2str.c index 6043fa244..23237fa53 100644 --- a/lib/util/sig2str.c +++ b/lib/util/sig2str.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2015, 2017-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/snprintf.c b/lib/util/snprintf.c index 4b779d142..c2c032079 100644 --- a/lib/util/snprintf.c +++ b/lib/util/snprintf.c @@ -1,5 +1,7 @@ /* $OpenBSD: vfprintf.c,v 1.67 2014/12/21 00:23:30 daniel Exp $ */ -/*- +/* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1999-2005, 2008, 2010-2016 * Todd C. Miller * Copyright (c) 1990, 1993 diff --git a/lib/util/strlcat.c b/lib/util/strlcat.c index fee8dc18f..0648d2932 100644 --- a/lib/util/strlcat.c +++ b/lib/util/strlcat.c @@ -1,6 +1,8 @@ /* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1998, 2003-2005, 2010-2011, 2013-2015 * Todd C. Miller * diff --git a/lib/util/strlcpy.c b/lib/util/strlcpy.c index ea8ab4d6e..981fb8ba9 100644 --- a/lib/util/strlcpy.c +++ b/lib/util/strlcpy.c @@ -1,6 +1,8 @@ /* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1998, 2003-2005, 2010-2011, 2013-2015 * Todd C. Miller * diff --git a/lib/util/strndup.c b/lib/util/strndup.c index 5d9ea5a9d..228df9321 100644 --- a/lib/util/strndup.c +++ b/lib/util/strndup.c @@ -1,6 +1,8 @@ /* $OpenBSD: strndup.c,v 1.1 2010/05/18 22:24:55 tedu Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strnlen.c b/lib/util/strnlen.c index 7344e9fd6..5e0977aa7 100644 --- a/lib/util/strnlen.c +++ b/lib/util/strnlen.c @@ -1,6 +1,8 @@ /* $OpenBSD: strnlen.c,v 1.5 2014/06/10 04:17:37 deraadt Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strsignal.c b/lib/util/strsignal.c index a6f9eea87..327f98dd7 100644 --- a/lib/util/strsignal.c +++ b/lib/util/strsignal.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strsplit.c b/lib/util/strsplit.c index 728f225fb..c7ef74d7e 100644 --- a/lib/util/strsplit.c +++ b/lib/util/strsplit.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strtobool.c b/lib/util/strtobool.c index 74a6fd3c0..41c0b45e2 100644 --- a/lib/util/strtobool.c +++ b/lib/util/strtobool.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strtoid.c b/lib/util/strtoid.c index 2339a88df..2dfce7593 100644 --- a/lib/util/strtoid.c +++ b/lib/util/strtoid.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strtomode.c b/lib/util/strtomode.c index 5a1ec941f..a4a3ebffd 100644 --- a/lib/util/strtomode.c +++ b/lib/util/strtomode.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/strtonum.c b/lib/util/strtonum.c index aedbc02da..4bc97012e 100644 --- a/lib/util/strtonum.c +++ b/lib/util/strtonum.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/sudo_conf.c b/lib/util/sudo_conf.c index 1af69293f..152030a40 100644 --- a/lib/util/sudo_conf.c +++ b/lib/util/sudo_conf.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/sudo_debug.c b/lib/util/sudo_debug.c index 593af92e2..4c8414821 100644 --- a/lib/util/sudo_debug.c +++ b/lib/util/sudo_debug.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/sudo_dso.c b/lib/util/sudo_dso.c index 39d438105..9e4fd4d4a 100644 --- a/lib/util/sudo_dso.c +++ b/lib/util/sudo_dso.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010, 2012-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/term.c b/lib/util/term.c index 5151ffd49..f15172135 100644 --- a/lib/util/term.c +++ b/lib/util/term.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2015, 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/ttyname_dev.c b/lib/util/ttyname_dev.c index 3d8e20af3..fdb5b2973 100644 --- a/lib/util/ttyname_dev.c +++ b/lib/util/ttyname_dev.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/ttysize.c b/lib/util/ttysize.c index 66fa1463f..6f4e2ecd1 100644 --- a/lib/util/ttysize.c +++ b/lib/util/ttysize.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2012, 2014-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/utimens.c b/lib/util/utimens.c index 579391f14..fc1fb8478 100644 --- a/lib/util/utimens.c +++ b/lib/util/utimens.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2015, 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/util/vsyslog.c b/lib/util/vsyslog.c index 359a8f353..c3a44ad3d 100644 --- a/lib/util/vsyslog.c +++ b/lib/util/vsyslog.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2016-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in index 57647dc39..6a12f3bc1 100644 --- a/lib/zlib/Makefile.in +++ b/lib/zlib/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2011-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/log2cl.pl b/log2cl.pl index 9cfd96886..fe0c7906d 100755 --- a/log2cl.pl +++ b/log2cl.pl @@ -1,5 +1,7 @@ #!/usr/bin/env perl # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2017 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/m4/sudo.m4 b/m4/sudo.m4 index f67ee56c1..a34da6623 100644 --- a/m4/sudo.m4 +++ b/m4/sudo.m4 @@ -1,8 +1,22 @@ dnl Local m4 macros for autoconf (used by sudo) dnl +dnl SPDX-License-Identifier: ISC +dnl dnl Copyright (c) 1994-1996, 1998-2005, 2007-2015 dnl Todd C. Miller dnl +dnl Permission to use, copy, modify, and distribute this software for any +dnl purpose with or without fee is hereby granted, provided that the above +dnl copyright notice and this permission notice appear in all copies. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl dnl XXX - should cache values in all cases!!! dnl dnl checks for programs diff --git a/mkdep.pl b/mkdep.pl index 9a3823a92..d48cbc2b3 100755 --- a/mkdep.pl +++ b/mkdep.pl @@ -1,5 +1,7 @@ #!/usr/bin/env perl # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2011-2017 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/mkpkg b/mkpkg index 34c734368..0955e976c 100755 --- a/mkpkg +++ b/mkpkg @@ -1,5 +1,7 @@ #!/bin/sh # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2010-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/pathnames.h.in b/pathnames.h.in index 31db3a452..7a8a9d252 100644 --- a/pathnames.h.in +++ b/pathnames.h.in @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998, 1999, 2001, 2004, 2005, 2007-2014 * Todd C. Miller . * diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in index b148fa9cc..711bc50cc 100644 --- a/plugins/group_file/Makefile.in +++ b/plugins/group_file/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2010-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/group_file/getgrent.c b/plugins/group_file/getgrent.c index bcfd17fd3..7932fb874 100644 --- a/plugins/group_file/getgrent.c +++ b/plugins/group_file/getgrent.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2005,2008,2010-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/group_file/group_file.c b/plugins/group_file/group_file.c index f7621b3c0..20957b2e7 100644 --- a/plugins/group_file/group_file.c +++ b/plugins/group_file/group_file.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/group_file/plugin_test.c b/plugins/group_file/plugin_test.c index 129264a15..9b9412cf6 100644 --- a/plugins/group_file/plugin_test.c +++ b/plugins/group_file/plugin_test.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 34a66b136..91b97d9b6 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2011-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c index 7baaa313e..97bc49d54 100644 --- a/plugins/sample/sample_plugin.c +++ b/plugins/sample/sample_plugin.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 7d32dccbb..16050804a 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 1996, 1998-2005, 2007-2018 # Todd C. Miller # diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c index 66ab57508..adbf946d7 100644 --- a/plugins/sudoers/alias.c +++ b/plugins/sudoers/alias.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2007-2019 * Todd C. Miller * diff --git a/plugins/sudoers/audit.c b/plugins/sudoers/audit.c index 1b802c303..ec1aa0eed 100644 --- a/plugins/sudoers/audit.c +++ b/plugins/sudoers/audit.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/auth/afs.c b/plugins/sudoers/auth/afs.c index fa40e05d4..52f17a1d3 100644 --- a/plugins/sudoers/auth/afs.c +++ b/plugins/sudoers/auth/afs.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999, 2001-2005, 2007, 2010-2012, 2014-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c index 12abc8821..0c85ebbe8 100644 --- a/plugins/sudoers/auth/aix_auth.c +++ b/plugins/sudoers/auth/aix_auth.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c index 73572148b..f97662375 100644 --- a/plugins/sudoers/auth/bsdauth.c +++ b/plugins/sudoers/auth/bsdauth.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2000-2005, 2007-2008, 2010-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/dce.c b/plugins/sudoers/auth/dce.c index 0afe8c659..2f88b4b1c 100644 --- a/plugins/sudoers/auth/dce.c +++ b/plugins/sudoers/auth/dce.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2010-2012, 2014-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c index 36f7cd830..2291ff921 100644 --- a/plugins/sudoers/auth/fwtk.c +++ b/plugins/sudoers/auth/fwtk.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2008, 2010-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c index 247981cad..b298d5ab9 100644 --- a/plugins/sudoers/auth/kerb5.c +++ b/plugins/sudoers/auth/kerb5.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007-2008, 2010-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c index 4bb0c4a73..93fbb500c 100644 --- a/plugins/sudoers/auth/pam.c +++ b/plugins/sudoers/auth/pam.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c index e7093ab64..03c7a1695 100644 --- a/plugins/sudoers/auth/passwd.c +++ b/plugins/sudoers/auth/passwd.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2010-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c index 2a5a55be3..e86669119 100644 --- a/plugins/sudoers/auth/rfc1938.c +++ b/plugins/sudoers/auth/rfc1938.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1994-1996, 1998-2005, 2010-2012, 2014-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c index dc6000238..854ddb88d 100644 --- a/plugins/sudoers/auth/secureware.c +++ b/plugins/sudoers/auth/secureware.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1998-2005, 2010-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c index ca75c5650..64fd978bf 100644 --- a/plugins/sudoers/auth/securid5.c +++ b/plugins/sudoers/auth/securid5.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007, 2010-2012, 2014-2016 * Todd C. Miller * Copyright (c) 2002 Michael Stroucken diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c index 8e74de838..8f54c49ee 100644 --- a/plugins/sudoers/auth/sia.c +++ b/plugins/sudoers/auth/sia.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007, 2010-2015 * Todd C. Miller * diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c index be70f933c..0d8d99341 100644 --- a/plugins/sudoers/auth/sudo_auth.c +++ b/plugins/sudoers/auth/sudo_auth.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2008-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/auth/sudo_auth.h b/plugins/sudoers/auth/sudo_auth.h index 9ae69cd56..e14d077fd 100644 --- a/plugins/sudoers/auth/sudo_auth.h +++ b/plugins/sudoers/auth/sudo_auth.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007-2016, 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/base64.c b/plugins/sudoers/base64.c index af170e34b..3d86ae68f 100644 --- a/plugins/sudoers/base64.c +++ b/plugins/sudoers/base64.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/boottime.c b/plugins/sudoers/boottime.c index 560f042e1..8712ae0ea 100644 --- a/plugins/sudoers/boottime.c +++ b/plugins/sudoers/boottime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2015, 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/bsm_audit.c b/plugins/sudoers/bsm_audit.c index c0a8de4a7..bbb8525ed 100644 --- a/plugins/sudoers/bsm_audit.c +++ b/plugins/sudoers/bsm_audit.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2015 Todd C. Miller * Copyright (c) 2009 Christian S.J. Peron * diff --git a/plugins/sudoers/bsm_audit.h b/plugins/sudoers/bsm_audit.h index 21d61851e..cc85cee45 100644 --- a/plugins/sudoers/bsm_audit.h +++ b/plugins/sudoers/bsm_audit.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2010, 2013-2014 Todd C. Miller * Copyright (c) 2009 Christian S.J. Peron * diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c index 92f859c61..74c8f2f43 100644 --- a/plugins/sudoers/check.c +++ b/plugins/sudoers/check.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996,1998-2005, 2007-2018 * Todd C. Miller * diff --git a/plugins/sudoers/check.h b/plugins/sudoers/check.h index 11013c834..39c61fc49 100644 --- a/plugins/sudoers/check.h +++ b/plugins/sudoers/check.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996,1998-2005, 2007-2014 * Todd C. Miller * diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c index 034d5f8bc..14de2d79a 100644 --- a/plugins/sudoers/cvtsudoers.c +++ b/plugins/sudoers/cvtsudoers.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/cvtsudoers.h b/plugins/sudoers/cvtsudoers.h index b93474b91..721b81e50 100644 --- a/plugins/sudoers/cvtsudoers.h +++ b/plugins/sudoers/cvtsudoers.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/cvtsudoers_json.c b/plugins/sudoers/cvtsudoers_json.c index 5fbef1c68..ecc5a9dc9 100644 --- a/plugins/sudoers/cvtsudoers_json.c +++ b/plugins/sudoers/cvtsudoers_json.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/cvtsudoers_ldif.c b/plugins/sudoers/cvtsudoers_ldif.c index 0f43a5afc..efdce0ed9 100644 --- a/plugins/sudoers/cvtsudoers_ldif.c +++ b/plugins/sudoers/cvtsudoers_ldif.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/cvtsudoers_pwutil.c b/plugins/sudoers/cvtsudoers_pwutil.c index d9df68cc5..a8d97732d 100644 --- a/plugins/sudoers/cvtsudoers_pwutil.c +++ b/plugins/sudoers/cvtsudoers_pwutil.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2019 * Todd C. Miller * diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c index 88c9433ca..de161366f 100644 --- a/plugins/sudoers/defaults.c +++ b/plugins/sudoers/defaults.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007-2018 * Todd C. Miller * diff --git a/plugins/sudoers/defaults.h b/plugins/sudoers/defaults.h index 630c5d999..404aeb814 100644 --- a/plugins/sudoers/defaults.h +++ b/plugins/sudoers/defaults.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2008-2018 * Todd C. Miller * diff --git a/plugins/sudoers/digestname.c b/plugins/sudoers/digestname.c index a078edeb5..88eb14342 100644 --- a/plugins/sudoers/digestname.c +++ b/plugins/sudoers/digestname.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/editor.c b/plugins/sudoers/editor.c index ec8e7b02c..31d8b6e5b 100644 --- a/plugins/sudoers/editor.c +++ b/plugins/sudoers/editor.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c index 1efdc6a9a..2da55e1a7 100644 --- a/plugins/sudoers/env.c +++ b/plugins/sudoers/env.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2000-2005, 2007-2019 * Todd C. Miller * diff --git a/plugins/sudoers/env_pattern.c b/plugins/sudoers/env_pattern.c index a74515b41..22b17a5d9 100644 --- a/plugins/sudoers/env_pattern.c +++ b/plugins/sudoers/env_pattern.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/file.c b/plugins/sudoers/file.c index a8b02b32d..fff78a19f 100644 --- a/plugins/sudoers/file.c +++ b/plugins/sudoers/file.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2007-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/filedigest.c b/plugins/sudoers/filedigest.c index 764e35eba..c98023f9c 100644 --- a/plugins/sudoers/filedigest.c +++ b/plugins/sudoers/filedigest.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/find_path.c b/plugins/sudoers/find_path.c index 597523770..8e2f1fb88 100644 --- a/plugins/sudoers/find_path.c +++ b/plugins/sudoers/find_path.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2010-2015, 2017-2019 * Todd C. Miller * diff --git a/plugins/sudoers/fmtsudoers.c b/plugins/sudoers/fmtsudoers.c index eaef90253..0827e363c 100644 --- a/plugins/sudoers/fmtsudoers.c +++ b/plugins/sudoers/fmtsudoers.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2007-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/gc.c b/plugins/sudoers/gc.c index 1c14b715d..729068364 100644 --- a/plugins/sudoers/gc.c +++ b/plugins/sudoers/gc.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/gentime.c b/plugins/sudoers/gentime.c index eea459511..ccc717343 100644 --- a/plugins/sudoers/gentime.c +++ b/plugins/sudoers/gentime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c index da7776995..a6bdb4b83 100644 --- a/plugins/sudoers/getspwuid.c +++ b/plugins/sudoers/getspwuid.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2010-2012, 2014-2015 * Todd C. Miller * diff --git a/plugins/sudoers/gmtoff.c b/plugins/sudoers/gmtoff.c index 2e62d9f11..452181937 100644 --- a/plugins/sudoers/gmtoff.c +++ b/plugins/sudoers/gmtoff.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/goodpath.c b/plugins/sudoers/goodpath.c index a570e480e..5f183d18b 100644 --- a/plugins/sudoers/goodpath.c +++ b/plugins/sudoers/goodpath.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2010-2012, 2014-2016 * Todd C. Miller * diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c index 8fd8a2202..343e4299c 100644 --- a/plugins/sudoers/gram.c +++ b/plugins/sudoers/gram.c @@ -43,6 +43,8 @@ #define YYPREFIX "sudoers" #line 2 "gram.y" /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2013, 2014-2018 * Todd C. Miller * @@ -116,7 +118,7 @@ static bool add_userspec(struct member *, struct privilege *); static struct defaults *new_default(char *, char *, short); static struct member *new_member(char *, int); static struct command_digest *new_digest(int, char *); -#line 78 "gram.y" +#line 80 "gram.y" #ifndef YYSTYPE_DEFINED #define YYSTYPE_DEFINED typedef union { @@ -133,7 +135,7 @@ typedef union { int tok; } YYSTYPE; #endif /* YYSTYPE_DEFINED */ -#line 131 "gram.c" +#line 133 "gram.c" #define COMMAND 257 #define ALIAS 258 #define DEFVAR 259 @@ -673,7 +675,7 @@ short *yysslim; YYSTYPE *yyvs; unsigned int yystacksize; int yyparse(void); -#line 904 "gram.y" +#line 906 "gram.y" void sudoerserror(const char *s) { @@ -1098,7 +1100,7 @@ init_options(struct command_options *opts) opts->limitprivs = NULL; #endif } -#line 1044 "gram.c" +#line 1046 "gram.c" /* allocate initial stack or double stack size, up to YYMAXDEPTH */ #if defined(__cplusplus) || defined(__STDC__) static int yygrowstack(void) @@ -1307,23 +1309,23 @@ yyreduce: switch (yyn) { case 1: -#line 176 "gram.y" +#line 178 "gram.y" { ; } break; case 5: -#line 184 "gram.y" +#line 186 "gram.y" { ; } break; case 6: -#line 187 "gram.y" +#line 189 "gram.y" { yyerrok; } break; case 7: -#line 190 "gram.y" +#line 192 "gram.y" { if (!add_userspec(yyvsp[-1].member, yyvsp[0].privilege)) { sudoerserror(N_("unable to allocate memory")); @@ -1332,73 +1334,73 @@ case 7: } break; case 8: -#line 196 "gram.y" +#line 198 "gram.y" { ; } break; case 9: -#line 199 "gram.y" +#line 201 "gram.y" { ; } break; case 10: -#line 202 "gram.y" +#line 204 "gram.y" { ; } break; case 11: -#line 205 "gram.y" +#line 207 "gram.y" { ; } break; case 12: -#line 208 "gram.y" +#line 210 "gram.y" { if (!add_defaults(DEFAULTS, NULL, yyvsp[0].defaults)) YYERROR; } break; case 13: -#line 212 "gram.y" +#line 214 "gram.y" { if (!add_defaults(DEFAULTS_USER, yyvsp[-1].member, yyvsp[0].defaults)) YYERROR; } break; case 14: -#line 216 "gram.y" +#line 218 "gram.y" { if (!add_defaults(DEFAULTS_RUNAS, yyvsp[-1].member, yyvsp[0].defaults)) YYERROR; } break; case 15: -#line 220 "gram.y" +#line 222 "gram.y" { if (!add_defaults(DEFAULTS_HOST, yyvsp[-1].member, yyvsp[0].defaults)) YYERROR; } break; case 16: -#line 224 "gram.y" +#line 226 "gram.y" { if (!add_defaults(DEFAULTS_CMND, yyvsp[-1].member, yyvsp[0].defaults)) YYERROR; } break; case 18: -#line 231 "gram.y" +#line 233 "gram.y" { HLTQ_CONCAT(yyvsp[-2].defaults, yyvsp[0].defaults, entries); yyval.defaults = yyvsp[-2].defaults; } break; case 19: -#line 237 "gram.y" +#line 239 "gram.y" { yyval.defaults = new_default(yyvsp[0].string, NULL, true); if (yyval.defaults == NULL) { @@ -1408,7 +1410,7 @@ case 19: } break; case 20: -#line 244 "gram.y" +#line 246 "gram.y" { yyval.defaults = new_default(yyvsp[0].string, NULL, false); if (yyval.defaults == NULL) { @@ -1418,7 +1420,7 @@ case 20: } break; case 21: -#line 251 "gram.y" +#line 253 "gram.y" { yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, true); if (yyval.defaults == NULL) { @@ -1428,7 +1430,7 @@ case 21: } break; case 22: -#line 258 "gram.y" +#line 260 "gram.y" { yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '+'); if (yyval.defaults == NULL) { @@ -1438,7 +1440,7 @@ case 22: } break; case 23: -#line 265 "gram.y" +#line 267 "gram.y" { yyval.defaults = new_default(yyvsp[-2].string, yyvsp[0].string, '-'); if (yyval.defaults == NULL) { @@ -1448,14 +1450,14 @@ case 23: } break; case 25: -#line 275 "gram.y" +#line 277 "gram.y" { HLTQ_CONCAT(yyvsp[-2].privilege, yyvsp[0].privilege, entries); yyval.privilege = yyvsp[-2].privilege; } break; case 26: -#line 281 "gram.y" +#line 283 "gram.y" { struct privilege *p = calloc(1, sizeof(*p)); if (p == NULL) { @@ -1470,21 +1472,21 @@ case 26: } break; case 27: -#line 295 "gram.y" +#line 297 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = false; } break; case 28: -#line 299 "gram.y" +#line 301 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = true; } break; case 29: -#line 305 "gram.y" +#line 307 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); if (yyval.member == NULL) { @@ -1494,7 +1496,7 @@ case 29: } break; case 30: -#line 312 "gram.y" +#line 314 "gram.y" { yyval.member = new_member(NULL, ALL); if (yyval.member == NULL) { @@ -1504,7 +1506,7 @@ case 30: } break; case 31: -#line 319 "gram.y" +#line 321 "gram.y" { yyval.member = new_member(yyvsp[0].string, NETGROUP); if (yyval.member == NULL) { @@ -1514,7 +1516,7 @@ case 31: } break; case 32: -#line 326 "gram.y" +#line 328 "gram.y" { yyval.member = new_member(yyvsp[0].string, NTWKADDR); if (yyval.member == NULL) { @@ -1524,7 +1526,7 @@ case 32: } break; case 33: -#line 333 "gram.y" +#line 335 "gram.y" { yyval.member = new_member(yyvsp[0].string, WORD); if (yyval.member == NULL) { @@ -1534,7 +1536,7 @@ case 33: } break; case 35: -#line 343 "gram.y" +#line 345 "gram.y" { struct cmndspec *prev; prev = HLTQ_LAST(yyvsp[-2].cmndspec, cmndspec, entries); @@ -1588,7 +1590,7 @@ case 35: } break; case 36: -#line 396 "gram.y" +#line 398 "gram.y" { struct cmndspec *cs = calloc(1, sizeof(*cs)); if (cs == NULL) { @@ -1640,7 +1642,7 @@ case 36: } break; case 37: -#line 447 "gram.y" +#line 449 "gram.y" { yyval.digest = new_digest(SUDO_DIGEST_SHA224, yyvsp[0].string); if (yyval.digest == NULL) { @@ -1650,7 +1652,7 @@ case 37: } break; case 38: -#line 454 "gram.y" +#line 456 "gram.y" { yyval.digest = new_digest(SUDO_DIGEST_SHA256, yyvsp[0].string); if (yyval.digest == NULL) { @@ -1660,7 +1662,7 @@ case 38: } break; case 39: -#line 461 "gram.y" +#line 463 "gram.y" { yyval.digest = new_digest(SUDO_DIGEST_SHA384, yyvsp[0].string); if (yyval.digest == NULL) { @@ -1670,7 +1672,7 @@ case 39: } break; case 40: -#line 468 "gram.y" +#line 470 "gram.y" { yyval.digest = new_digest(SUDO_DIGEST_SHA512, yyvsp[0].string); if (yyval.digest == NULL) { @@ -1680,13 +1682,13 @@ case 40: } break; case 41: -#line 477 "gram.y" +#line 479 "gram.y" { yyval.member = yyvsp[0].member; } break; case 42: -#line 480 "gram.y" +#line 482 "gram.y" { if (yyvsp[0].member->type != COMMAND) { sudoerserror(N_("a digest requires a path name")); @@ -1698,75 +1700,75 @@ case 42: } break; case 43: -#line 491 "gram.y" +#line 493 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = false; } break; case 44: -#line 495 "gram.y" +#line 497 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = true; } break; case 45: -#line 501 "gram.y" +#line 503 "gram.y" { yyval.string = yyvsp[0].string; } break; case 46: -#line 506 "gram.y" +#line 508 "gram.y" { yyval.string = yyvsp[0].string; } break; case 47: -#line 510 "gram.y" +#line 512 "gram.y" { yyval.string = yyvsp[0].string; } break; case 48: -#line 515 "gram.y" +#line 517 "gram.y" { yyval.string = yyvsp[0].string; } break; case 49: -#line 520 "gram.y" +#line 522 "gram.y" { yyval.string = yyvsp[0].string; } break; case 50: -#line 525 "gram.y" +#line 527 "gram.y" { yyval.string = yyvsp[0].string; } break; case 51: -#line 529 "gram.y" +#line 531 "gram.y" { yyval.string = yyvsp[0].string; } break; case 52: -#line 534 "gram.y" +#line 536 "gram.y" { yyval.runas = NULL; } break; case 53: -#line 537 "gram.y" +#line 539 "gram.y" { yyval.runas = yyvsp[-1].runas; } break; case 54: -#line 542 "gram.y" +#line 544 "gram.y" { yyval.runas = calloc(1, sizeof(struct runascontainer)); if (yyval.runas != NULL) { @@ -1784,7 +1786,7 @@ case 54: } break; case 55: -#line 557 "gram.y" +#line 559 "gram.y" { yyval.runas = calloc(1, sizeof(struct runascontainer)); if (yyval.runas == NULL) { @@ -1796,7 +1798,7 @@ case 55: } break; case 56: -#line 566 "gram.y" +#line 568 "gram.y" { yyval.runas = calloc(1, sizeof(struct runascontainer)); if (yyval.runas == NULL) { @@ -1808,7 +1810,7 @@ case 56: } break; case 57: -#line 575 "gram.y" +#line 577 "gram.y" { yyval.runas = calloc(1, sizeof(struct runascontainer)); if (yyval.runas == NULL) { @@ -1820,7 +1822,7 @@ case 57: } break; case 58: -#line 584 "gram.y" +#line 586 "gram.y" { yyval.runas = calloc(1, sizeof(struct runascontainer)); if (yyval.runas != NULL) { @@ -1838,13 +1840,13 @@ case 58: } break; case 59: -#line 601 "gram.y" +#line 603 "gram.y" { init_options(&yyval.options); } break; case 60: -#line 604 "gram.y" +#line 606 "gram.y" { yyval.options.notbefore = parse_gentime(yyvsp[0].string); free(yyvsp[0].string); @@ -1855,7 +1857,7 @@ case 60: } break; case 61: -#line 612 "gram.y" +#line 614 "gram.y" { yyval.options.notafter = parse_gentime(yyvsp[0].string); free(yyvsp[0].string); @@ -1866,7 +1868,7 @@ case 61: } break; case 62: -#line 620 "gram.y" +#line 622 "gram.y" { yyval.options.timeout = parse_timeout(yyvsp[0].string); free(yyvsp[0].string); @@ -1880,7 +1882,7 @@ case 62: } break; case 63: -#line 631 "gram.y" +#line 633 "gram.y" { #ifdef HAVE_SELINUX free(yyval.options.role); @@ -1889,7 +1891,7 @@ case 63: } break; case 64: -#line 637 "gram.y" +#line 639 "gram.y" { #ifdef HAVE_SELINUX free(yyval.options.type); @@ -1898,7 +1900,7 @@ case 64: } break; case 65: -#line 643 "gram.y" +#line 645 "gram.y" { #ifdef HAVE_PRIV_SET free(yyval.options.privs); @@ -1907,7 +1909,7 @@ case 65: } break; case 66: -#line 649 "gram.y" +#line 651 "gram.y" { #ifdef HAVE_PRIV_SET free(yyval.options.limitprivs); @@ -1916,97 +1918,97 @@ case 66: } break; case 67: -#line 657 "gram.y" +#line 659 "gram.y" { TAGS_INIT(yyval.tag); } break; case 68: -#line 660 "gram.y" +#line 662 "gram.y" { yyval.tag.nopasswd = true; } break; case 69: -#line 663 "gram.y" +#line 665 "gram.y" { yyval.tag.nopasswd = false; } break; case 70: -#line 666 "gram.y" +#line 668 "gram.y" { yyval.tag.noexec = true; } break; case 71: -#line 669 "gram.y" +#line 671 "gram.y" { yyval.tag.noexec = false; } break; case 72: -#line 672 "gram.y" +#line 674 "gram.y" { yyval.tag.setenv = true; } break; case 73: -#line 675 "gram.y" +#line 677 "gram.y" { yyval.tag.setenv = false; } break; case 74: -#line 678 "gram.y" +#line 680 "gram.y" { yyval.tag.log_input = true; } break; case 75: -#line 681 "gram.y" +#line 683 "gram.y" { yyval.tag.log_input = false; } break; case 76: -#line 684 "gram.y" +#line 686 "gram.y" { yyval.tag.log_output = true; } break; case 77: -#line 687 "gram.y" +#line 689 "gram.y" { yyval.tag.log_output = false; } break; case 78: -#line 690 "gram.y" +#line 692 "gram.y" { yyval.tag.follow = true; } break; case 79: -#line 693 "gram.y" +#line 695 "gram.y" { yyval.tag.follow = false; } break; case 80: -#line 696 "gram.y" +#line 698 "gram.y" { yyval.tag.send_mail = true; } break; case 81: -#line 699 "gram.y" +#line 701 "gram.y" { yyval.tag.send_mail = false; } break; case 82: -#line 704 "gram.y" +#line 706 "gram.y" { yyval.member = new_member(NULL, ALL); if (yyval.member == NULL) { @@ -2016,7 +2018,7 @@ case 82: } break; case 83: -#line 711 "gram.y" +#line 713 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); if (yyval.member == NULL) { @@ -2026,7 +2028,7 @@ case 83: } break; case 84: -#line 718 "gram.y" +#line 720 "gram.y" { struct sudo_command *c = calloc(1, sizeof(*c)); if (c == NULL) { @@ -2044,7 +2046,7 @@ case 84: } break; case 87: -#line 739 "gram.y" +#line 741 "gram.y" { const char *s; s = alias_add(&parsed_policy, yyvsp[-2].string, HOSTALIAS, @@ -2056,14 +2058,14 @@ case 87: } break; case 89: -#line 751 "gram.y" +#line 753 "gram.y" { HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries); yyval.member = yyvsp[-2].member; } break; case 92: -#line 761 "gram.y" +#line 763 "gram.y" { const char *s; s = alias_add(&parsed_policy, yyvsp[-2].string, CMNDALIAS, @@ -2075,14 +2077,14 @@ case 92: } break; case 94: -#line 773 "gram.y" +#line 775 "gram.y" { HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries); yyval.member = yyvsp[-2].member; } break; case 97: -#line 783 "gram.y" +#line 785 "gram.y" { const char *s; s = alias_add(&parsed_policy, yyvsp[-2].string, RUNASALIAS, @@ -2094,7 +2096,7 @@ case 97: } break; case 100: -#line 798 "gram.y" +#line 800 "gram.y" { const char *s; s = alias_add(&parsed_policy, yyvsp[-2].string, USERALIAS, @@ -2106,28 +2108,28 @@ case 100: } break; case 102: -#line 810 "gram.y" +#line 812 "gram.y" { HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries); yyval.member = yyvsp[-2].member; } break; case 103: -#line 816 "gram.y" +#line 818 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = false; } break; case 104: -#line 820 "gram.y" +#line 822 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = true; } break; case 105: -#line 826 "gram.y" +#line 828 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); if (yyval.member == NULL) { @@ -2137,7 +2139,7 @@ case 105: } break; case 106: -#line 833 "gram.y" +#line 835 "gram.y" { yyval.member = new_member(NULL, ALL); if (yyval.member == NULL) { @@ -2147,7 +2149,7 @@ case 106: } break; case 107: -#line 840 "gram.y" +#line 842 "gram.y" { yyval.member = new_member(yyvsp[0].string, NETGROUP); if (yyval.member == NULL) { @@ -2157,7 +2159,7 @@ case 107: } break; case 108: -#line 847 "gram.y" +#line 849 "gram.y" { yyval.member = new_member(yyvsp[0].string, USERGROUP); if (yyval.member == NULL) { @@ -2167,7 +2169,7 @@ case 108: } break; case 109: -#line 854 "gram.y" +#line 856 "gram.y" { yyval.member = new_member(yyvsp[0].string, WORD); if (yyval.member == NULL) { @@ -2177,28 +2179,28 @@ case 109: } break; case 111: -#line 864 "gram.y" +#line 866 "gram.y" { HLTQ_CONCAT(yyvsp[-2].member, yyvsp[0].member, entries); yyval.member = yyvsp[-2].member; } break; case 112: -#line 870 "gram.y" +#line 872 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = false; } break; case 113: -#line 874 "gram.y" +#line 876 "gram.y" { yyval.member = yyvsp[0].member; yyval.member->negated = true; } break; case 114: -#line 880 "gram.y" +#line 882 "gram.y" { yyval.member = new_member(yyvsp[0].string, ALIAS); if (yyval.member == NULL) { @@ -2208,7 +2210,7 @@ case 114: } break; case 115: -#line 887 "gram.y" +#line 889 "gram.y" { yyval.member = new_member(NULL, ALL); if (yyval.member == NULL) { @@ -2218,7 +2220,7 @@ case 115: } break; case 116: -#line 894 "gram.y" +#line 896 "gram.y" { yyval.member = new_member(yyvsp[0].string, WORD); if (yyval.member == NULL) { @@ -2227,7 +2229,7 @@ case 116: } } break; -#line 2173 "gram.c" +#line 2175 "gram.c" } yyssp -= yym; yystate = *yyssp; diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y index c911a26d5..6f437062b 100644 --- a/plugins/sudoers/gram.y +++ b/plugins/sudoers/gram.y @@ -1,5 +1,7 @@ %{ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2013, 2014-2018 * Todd C. Miller * diff --git a/plugins/sudoers/group_plugin.c b/plugins/sudoers/group_plugin.c index 0627f6c39..1a7e00ba4 100644 --- a/plugins/sudoers/group_plugin.c +++ b/plugins/sudoers/group_plugin.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/hexchar.c b/plugins/sudoers/hexchar.c index 1813b6656..07e892bf5 100644 --- a/plugins/sudoers/hexchar.c +++ b/plugins/sudoers/hexchar.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/ins_2001.h b/plugins/sudoers/ins_2001.h index c6ad6ff01..d2ce98943 100644 --- a/plugins/sudoers/ins_2001.h +++ b/plugins/sudoers/ins_2001.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998, 1999 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/ins_classic.h b/plugins/sudoers/ins_classic.h index 2448151a5..08d54d7f9 100644 --- a/plugins/sudoers/ins_classic.h +++ b/plugins/sudoers/ins_classic.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998, 1999 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/ins_csops.h b/plugins/sudoers/ins_csops.h index 45c5dd3a9..fe66cfa0c 100644 --- a/plugins/sudoers/ins_csops.h +++ b/plugins/sudoers/ins_csops.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998, 1999, 2004 * Todd C. Miller * diff --git a/plugins/sudoers/ins_goons.h b/plugins/sudoers/ins_goons.h index 5ed5e316a..34df45bfd 100644 --- a/plugins/sudoers/ins_goons.h +++ b/plugins/sudoers/ins_goons.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998, 1999 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/ins_python.h b/plugins/sudoers/ins_python.h index 28f53d228..16088f365 100644 --- a/plugins/sudoers/ins_python.h +++ b/plugins/sudoers/ins_python.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/insults.h b/plugins/sudoers/insults.h index cc08023fc..d7d8074de 100644 --- a/plugins/sudoers/insults.h +++ b/plugins/sudoers/insults.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1994-1996, 1998-1999, 2004 * Todd C. Miller * diff --git a/plugins/sudoers/interfaces.c b/plugins/sudoers/interfaces.c index bd65366f5..4be665e43 100644 --- a/plugins/sudoers/interfaces.c +++ b/plugins/sudoers/interfaces.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/interfaces.h b/plugins/sudoers/interfaces.h index 73e55b45d..49cca7203 100644 --- a/plugins/sudoers/interfaces.h +++ b/plugins/sudoers/interfaces.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007, 2010-2013 * Todd C. Miller * diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c index 338169cb5..1fa4239f3 100644 --- a/plugins/sudoers/iolog.c +++ b/plugins/sudoers/iolog.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/iolog.h b/plugins/sudoers/iolog.h index d803a15b7..4ef89632b 100644 --- a/plugins/sudoers/iolog.h +++ b/plugins/sudoers/iolog.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/iolog_event.h b/plugins/sudoers/iolog_event.h index bd3e9b42f..aa9d972b6 100644 --- a/plugins/sudoers/iolog_event.h +++ b/plugins/sudoers/iolog_event.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/iolog_files.h b/plugins/sudoers/iolog_files.h index 889c20b3f..b564fa607 100644 --- a/plugins/sudoers/iolog_files.h +++ b/plugins/sudoers/iolog_files.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c index 7cdc6ed08..5a5d75ae0 100644 --- a/plugins/sudoers/iolog_path.c +++ b/plugins/sudoers/iolog_path.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/iolog_util.c b/plugins/sudoers/iolog_util.c index 5549552e7..bdf553c08 100644 --- a/plugins/sudoers/iolog_util.c +++ b/plugins/sudoers/iolog_util.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c index 491937135..417b87058 100644 --- a/plugins/sudoers/ldap.c +++ b/plugins/sudoers/ldap.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2003-2019 Todd C. Miller * * This code is derived from software contributed by Aaron Spangler. diff --git a/plugins/sudoers/ldap_conf.c b/plugins/sudoers/ldap_conf.c index 59d7fda16..157aafc4d 100644 --- a/plugins/sudoers/ldap_conf.c +++ b/plugins/sudoers/ldap_conf.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2003-2019 Todd C. Miller * * This code is derived from software contributed by Aaron Spangler. diff --git a/plugins/sudoers/ldap_util.c b/plugins/sudoers/ldap_util.c index 77eb1ee7e..fdd8fa894 100644 --- a/plugins/sudoers/ldap_util.c +++ b/plugins/sudoers/ldap_util.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013, 2016, 2018-2018 Todd C. Miller * * This code is derived from software contributed by Aaron Spangler. diff --git a/plugins/sudoers/linux_audit.c b/plugins/sudoers/linux_audit.c index 6ac8be0a5..22dc54de2 100644 --- a/plugins/sudoers/linux_audit.c +++ b/plugins/sudoers/linux_audit.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/linux_audit.h b/plugins/sudoers/linux_audit.h index 84e55a0c8..2c4f0f615 100644 --- a/plugins/sudoers/linux_audit.h +++ b/plugins/sudoers/linux_audit.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010, 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/locale.c b/plugins/sudoers/locale.c index c69fd606a..6bd32ca44 100644 --- a/plugins/sudoers/locale.c +++ b/plugins/sudoers/locale.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c index c200698e6..6064105b2 100644 --- a/plugins/sudoers/logging.c +++ b/plugins/sudoers/logging.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1994-1996, 1998-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/logging.h b/plugins/sudoers/logging.h index c7e99aeed..f87342586 100644 --- a/plugins/sudoers/logging.h +++ b/plugins/sudoers/logging.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2009-2018 * Todd C. Miller * diff --git a/plugins/sudoers/logwrap.c b/plugins/sudoers/logwrap.c index b10e4652a..fcba62d3b 100644 --- a/plugins/sudoers/logwrap.c +++ b/plugins/sudoers/logwrap.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011, 2014-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c index 5023c05f3..1936d4b0b 100644 --- a/plugins/sudoers/match.c +++ b/plugins/sudoers/match.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2019 * Todd C. Miller * diff --git a/plugins/sudoers/match_addr.c b/plugins/sudoers/match_addr.c index 4310e05dd..30a437e05 100644 --- a/plugins/sudoers/match_addr.c +++ b/plugins/sudoers/match_addr.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2015 * Todd C. Miller * diff --git a/plugins/sudoers/match_command.c b/plugins/sudoers/match_command.c index 71993dfba..995a508b4 100644 --- a/plugins/sudoers/match_command.c +++ b/plugins/sudoers/match_command.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2019 * Todd C. Miller * diff --git a/plugins/sudoers/match_digest.c b/plugins/sudoers/match_digest.c index 8c0bf6176..c2eb17d53 100644 --- a/plugins/sudoers/match_digest.c +++ b/plugins/sudoers/match_digest.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2019 * Todd C. Miller * diff --git a/plugins/sudoers/mkdir_parents.c b/plugins/sudoers/mkdir_parents.c index 5fa51aca7..692cf8d04 100644 --- a/plugins/sudoers/mkdir_parents.c +++ b/plugins/sudoers/mkdir_parents.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c index c9bd36f4c..bf8d9ae6c 100644 --- a/plugins/sudoers/parse.c +++ b/plugins/sudoers/parse.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2007-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h index fd4462742..8180f29d2 100644 --- a/plugins/sudoers/parse.h +++ b/plugins/sudoers/parse.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2000, 2004, 2007-2018 * Todd C. Miller * diff --git a/plugins/sudoers/parse_ldif.c b/plugins/sudoers/parse_ldif.c index df8c610fb..4ac3c2783 100644 --- a/plugins/sudoers/parse_ldif.c +++ b/plugins/sudoers/parse_ldif.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c index 003c787d8..17c43e23c 100644 --- a/plugins/sudoers/policy.c +++ b/plugins/sudoers/policy.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/prompt.c b/plugins/sudoers/prompt.c index d79d7d50b..3d8a97ddf 100644 --- a/plugins/sudoers/prompt.c +++ b/plugins/sudoers/prompt.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996,1998-2005, 2007-2015 * Todd C. Miller * diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c index 963d0713e..e21c05f6a 100644 --- a/plugins/sudoers/pwutil.c +++ b/plugins/sudoers/pwutil.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2018 * Todd C. Miller * diff --git a/plugins/sudoers/pwutil.h b/plugins/sudoers/pwutil.h index 7c36e70b8..e5d7f221b 100644 --- a/plugins/sudoers/pwutil.h +++ b/plugins/sudoers/pwutil.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2013, 2015-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/pwutil_impl.c b/plugins/sudoers/pwutil_impl.c index 76230a332..9d56e732b 100644 --- a/plugins/sudoers/pwutil_impl.c +++ b/plugins/sudoers/pwutil_impl.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2018 * Todd C. Miller * diff --git a/plugins/sudoers/rcstr.c b/plugins/sudoers/rcstr.c index 8ad2d5d02..96b12b551 100644 --- a/plugins/sudoers/rcstr.c +++ b/plugins/sudoers/rcstr.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2016-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/redblack.c b/plugins/sudoers/redblack.c index ef7e8f566..f43d98aa4 100644 --- a/plugins/sudoers/redblack.c +++ b/plugins/sudoers/redblack.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2007, 2009-2015 * Todd C. Miller * diff --git a/plugins/sudoers/redblack.h b/plugins/sudoers/redblack.h index 2b4063663..300383d15 100644 --- a/plugins/sudoers/redblack.h +++ b/plugins/sudoers/redblack.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004, 2007, 2010, 2013 * Todd C. Miller * diff --git a/plugins/sudoers/regress/check_symbols/check_symbols.c b/plugins/sudoers/regress/check_symbols/check_symbols.c index 664760978..ccb2ad773 100644 --- a/plugins/sudoers/regress/check_symbols/check_symbols.c +++ b/plugins/sudoers/regress/check_symbols/check_symbols.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/env_match/check_env_pattern.c b/plugins/sudoers/regress/env_match/check_env_pattern.c index 96dc8c56d..eece41e57 100644 --- a/plugins/sudoers/regress/env_match/check_env_pattern.c +++ b/plugins/sudoers/regress/env_match/check_env_pattern.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c index 69ea767f2..56db1e44b 100644 --- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c +++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/iolog_plugin/check_iolog_plugin.c b/plugins/sudoers/regress/iolog_plugin/check_iolog_plugin.c index 456ed3c35..d3523607c 100644 --- a/plugins/sudoers/regress/iolog_plugin/check_iolog_plugin.c +++ b/plugins/sudoers/regress/iolog_plugin/check_iolog_plugin.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/iolog_util/check_iolog_util.c b/plugins/sudoers/regress/iolog_util/check_iolog_util.c index d9c932d31..64976c5ea 100644 --- a/plugins/sudoers/regress/iolog_util/check_iolog_util.c +++ b/plugins/sudoers/regress/iolog_util/check_iolog_util.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c index cc007adb4..3437c7a59 100644 --- a/plugins/sudoers/regress/logging/check_wrap.c +++ b/plugins/sudoers/regress/logging/check_wrap.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c index 5f67d4dca..96e71b266 100644 --- a/plugins/sudoers/regress/parser/check_addr.c +++ b/plugins/sudoers/regress/parser/check_addr.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/parser/check_base64.c b/plugins/sudoers/regress/parser/check_base64.c index a3f28e0af..6c70c982e 100644 --- a/plugins/sudoers/regress/parser/check_base64.c +++ b/plugins/sudoers/regress/parser/check_base64.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/parser/check_digest.c b/plugins/sudoers/regress/parser/check_digest.c index 0d49a35df..c24c78d1a 100644 --- a/plugins/sudoers/regress/parser/check_digest.c +++ b/plugins/sudoers/regress/parser/check_digest.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/parser/check_fill.c b/plugins/sudoers/regress/parser/check_fill.c index e0312b6b1..e254c1cf9 100644 --- a/plugins/sudoers/regress/parser/check_fill.c +++ b/plugins/sudoers/regress/parser/check_fill.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/parser/check_gentime.c b/plugins/sudoers/regress/parser/check_gentime.c index 957ea4c04..ba840bc3c 100644 --- a/plugins/sudoers/regress/parser/check_gentime.c +++ b/plugins/sudoers/regress/parser/check_gentime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/parser/check_hexchar.c b/plugins/sudoers/regress/parser/check_hexchar.c index d4f965783..6722f5eff 100644 --- a/plugins/sudoers/regress/parser/check_hexchar.c +++ b/plugins/sudoers/regress/parser/check_hexchar.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/regress/starttime/check_starttime.c b/plugins/sudoers/regress/starttime/check_starttime.c index e858ad370..03bc930bd 100644 --- a/plugins/sudoers/regress/starttime/check_starttime.c +++ b/plugins/sudoers/regress/starttime/check_starttime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c index ee113df4b..528440fa2 100644 --- a/plugins/sudoers/set_perms.c +++ b/plugins/sudoers/set_perms.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1994-1996, 1998-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/solaris_audit.c b/plugins/sudoers/solaris_audit.c index 650595ae6..a0196535f 100644 --- a/plugins/sudoers/solaris_audit.c +++ b/plugins/sudoers/solaris_audit.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014, Oracle and/or its affiliates. * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/solaris_audit.h b/plugins/sudoers/solaris_audit.h index 36a124508..39ab21eb5 100644 --- a/plugins/sudoers/solaris_audit.h +++ b/plugins/sudoers/solaris_audit.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014, Oracle and/or its affiliates. * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sssd.c b/plugins/sudoers/sssd.c index 6698f1da0..4f4464a62 100644 --- a/plugins/sudoers/sssd.c +++ b/plugins/sudoers/sssd.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2003-2018 Todd C. Miller * Copyright (c) 2011 Daniel Kopecek * diff --git a/plugins/sudoers/starttime.c b/plugins/sudoers/starttime.c index 8bc526b4e..5e435ddb9 100644 --- a/plugins/sudoers/starttime.c +++ b/plugins/sudoers/starttime.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/strlist.c b/plugins/sudoers/strlist.c index e1f5516c0..69ad7beed 100644 --- a/plugins/sudoers/strlist.c +++ b/plugins/sudoers/strlist.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/strlist.h b/plugins/sudoers/strlist.h index 1a0dfc6c8..022f52bbd 100644 --- a/plugins/sudoers/strlist.h +++ b/plugins/sudoers/strlist.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/stubs.c b/plugins/sudoers/stubs.c index a594b1f48..caf15c31f 100644 --- a/plugins/sudoers/stubs.c +++ b/plugins/sudoers/stubs.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudo_ldap.h b/plugins/sudoers/sudo_ldap.h index 7298ee01e..a2162bc3a 100644 --- a/plugins/sudoers/sudo_ldap.h +++ b/plugins/sudoers/sudo_ldap.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudo_ldap_conf.h b/plugins/sudoers/sudo_ldap_conf.h index 363ab43cb..d0b4fd675 100644 --- a/plugins/sudoers/sudo_ldap_conf.h +++ b/plugins/sudoers/sudo_ldap_conf.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c index 03515e0c7..a6f592071 100644 --- a/plugins/sudoers/sudo_nss.c +++ b/plugins/sudoers/sudo_nss.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudo_nss.h b/plugins/sudoers/sudo_nss.h index e4566f8ff..bb0c49a96 100644 --- a/plugins/sudoers/sudo_nss.h +++ b/plugins/sudoers/sudo_nss.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007-2011, 2013-2015, 2017-2018 * Todd C. Miller * diff --git a/plugins/sudoers/sudo_printf.c b/plugins/sudoers/sudo_printf.c index e82317f19..9e6a3d9b1 100644 --- a/plugins/sudoers/sudo_printf.c +++ b/plugins/sudoers/sudo_printf.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2012 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c index d05c9f64e..a809e8546 100644 --- a/plugins/sudoers/sudoers.c +++ b/plugins/sudoers/sudoers.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996, 1998-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h index 25d6b2d97..5c2da6f46 100644 --- a/plugins/sudoers/sudoers.h +++ b/plugins/sudoers/sudoers.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996, 1998-2005, 2007-2017 * Todd C. Miller * diff --git a/plugins/sudoers/sudoers_debug.c b/plugins/sudoers/sudoers_debug.c index d09ec1225..86ec41362 100644 --- a/plugins/sudoers/sudoers_debug.c +++ b/plugins/sudoers/sudoers_debug.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudoers_debug.h b/plugins/sudoers/sudoers_debug.h index 7a4df4eec..a3119fea1 100644 --- a/plugins/sudoers/sudoers_debug.h +++ b/plugins/sudoers/sudoers_debug.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/sudoers_version.h b/plugins/sudoers/sudoers_version.h index 23bb706b3..c548c7745 100644 --- a/plugins/sudoers/sudoers_version.h +++ b/plugins/sudoers/sudoers_version.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2013, 2015, 2017 * Todd C. Miller * diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c index e20f5f035..255531417 100644 --- a/plugins/sudoers/sudoreplay.c +++ b/plugins/sudoers/sudoreplay.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c index 2a97dfc00..83775bb1b 100644 --- a/plugins/sudoers/testsudoers.c +++ b/plugins/sudoers/testsudoers.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2018 * Todd C. Miller * diff --git a/plugins/sudoers/timeout.c b/plugins/sudoers/timeout.c index 3b621e355..71796cad3 100644 --- a/plugins/sudoers/timeout.c +++ b/plugins/sudoers/timeout.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c index d926cdd4e..5fe1abf40 100644 --- a/plugins/sudoers/timestamp.c +++ b/plugins/sudoers/timestamp.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2014-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/timestr.c b/plugins/sudoers/timestr.c index d94d09c13..86de36437 100644 --- a/plugins/sudoers/timestr.c +++ b/plugins/sudoers/timestr.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999, 2009-2011, 2013-2015, 2017 * Todd C. Miller * diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c index 544cfe186..679c0d54d 100644 --- a/plugins/sudoers/toke.c +++ b/plugins/sudoers/toke.c @@ -2186,6 +2186,8 @@ char *sudoerstext; #line 1 "toke.l" #line 2 "toke.l" /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2017 * Todd C. Miller * @@ -2277,7 +2279,7 @@ int (*trace_print)(const char *msg) = sudoers_trace_print; -#line 2275 "toke.c" +#line 2277 "toke.c" #define INITIAL 0 #define GOTDEFS 1 @@ -2493,9 +2495,9 @@ YY_DECL } { -#line 113 "toke.l" +#line 115 "toke.l" -#line 2493 "toke.c" +#line 2495 "toke.c" while ( 1 ) /* loops until end-of-file is reached */ { @@ -2555,7 +2557,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 114 "toke.l" +#line 116 "toke.l" { LEXTRACE(", "); LEXRETURN(','); @@ -2563,12 +2565,12 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 119 "toke.l" +#line 121 "toke.l" BEGIN STARTDEFS; YY_BREAK case 3: YY_RULE_SETUP -#line 121 "toke.l" +#line 123 "toke.l" { BEGIN INDEFS; LEXTRACE("DEFVAR "); @@ -2580,7 +2582,7 @@ YY_RULE_SETUP case 4: YY_RULE_SETUP -#line 130 "toke.l" +#line 132 "toke.l" { BEGIN STARTDEFS; LEXTRACE(", "); @@ -2589,7 +2591,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 136 "toke.l" +#line 138 "toke.l" { LEXTRACE("= "); LEXRETURN('='); @@ -2597,7 +2599,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 141 "toke.l" +#line 143 "toke.l" { LEXTRACE("+= "); LEXRETURN('+'); @@ -2605,7 +2607,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 146 "toke.l" +#line 148 "toke.l" { LEXTRACE("-= "); LEXRETURN('-'); @@ -2613,7 +2615,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 151 "toke.l" +#line 153 "toke.l" { LEXTRACE("BEGINSTR "); sudoerslval.string = NULL; @@ -2623,7 +2625,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 158 "toke.l" +#line 160 "toke.l" { LEXTRACE("WORD(2) "); if (!fill(sudoerstext, sudoersleng)) @@ -2636,7 +2638,7 @@ YY_RULE_SETUP case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 167 "toke.l" +#line 169 "toke.l" { /* Line continuation char followed by newline. */ sudolineno++; @@ -2645,7 +2647,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 173 "toke.l" +#line 175 "toke.l" { LEXTRACE("ENDSTR "); BEGIN prev_state; @@ -2680,7 +2682,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 205 "toke.l" +#line 207 "toke.l" { LEXTRACE("BACKSLASH "); if (!append(sudoerstext, sudoersleng)) @@ -2689,7 +2691,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 211 "toke.l" +#line 213 "toke.l" { LEXTRACE("STRBODY "); if (!append(sudoerstext, sudoersleng)) @@ -2700,7 +2702,7 @@ YY_RULE_SETUP case 14: YY_RULE_SETUP -#line 219 "toke.l" +#line 221 "toke.l" { /* quoted fnmatch glob char, pass verbatim */ LEXTRACE("QUOTEDCHAR "); @@ -2711,7 +2713,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 227 "toke.l" +#line 229 "toke.l" { /* quoted sudoers special char, strip backslash */ LEXTRACE("QUOTEDCHAR "); @@ -2723,7 +2725,7 @@ YY_RULE_SETUP case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 235 "toke.l" +#line 237 "toke.l" { BEGIN INITIAL; yyless(0); @@ -2732,7 +2734,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 241 "toke.l" +#line 243 "toke.l" { LEXTRACE("ARG "); if (!fill_args(sudoerstext, sudoersleng, sawspace)) @@ -2743,7 +2745,7 @@ YY_RULE_SETUP case 18: YY_RULE_SETUP -#line 249 "toke.l" +#line 251 "toke.l" { /* Only return DIGEST if the length is correct. */ yy_size_t digest_len = @@ -2761,7 +2763,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 264 "toke.l" +#line 266 "toke.l" { /* Only return DIGEST if the length is correct. */ yy_size_t len, digest_len = @@ -2787,7 +2789,7 @@ YY_RULE_SETUP case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 286 "toke.l" +#line 288 "toke.l" { char *path; @@ -2809,7 +2811,7 @@ YY_RULE_SETUP case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 304 "toke.l" +#line 306 "toke.l" { char *path; @@ -2833,7 +2835,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 325 "toke.l" +#line 327 "toke.l" { char deftype; int n; @@ -2876,7 +2878,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 365 "toke.l" +#line 367 "toke.l" { int n; @@ -2905,7 +2907,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 391 "toke.l" +#line 393 "toke.l" { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); @@ -2914,7 +2916,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 397 "toke.l" +#line 399 "toke.l" { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); @@ -2923,7 +2925,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 403 "toke.l" +#line 405 "toke.l" { LEXTRACE("NOEXEC "); LEXRETURN(NOEXEC); @@ -2931,7 +2933,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 408 "toke.l" +#line 410 "toke.l" { LEXTRACE("EXEC "); LEXRETURN(EXEC); @@ -2939,7 +2941,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 413 "toke.l" +#line 415 "toke.l" { LEXTRACE("SETENV "); LEXRETURN(SETENV); @@ -2947,7 +2949,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 418 "toke.l" +#line 420 "toke.l" { LEXTRACE("NOSETENV "); LEXRETURN(NOSETENV); @@ -2955,7 +2957,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 423 "toke.l" +#line 425 "toke.l" { LEXTRACE("LOG_OUTPUT "); LEXRETURN(LOG_OUTPUT); @@ -2963,7 +2965,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 428 "toke.l" +#line 430 "toke.l" { LEXTRACE("NOLOG_OUTPUT "); LEXRETURN(NOLOG_OUTPUT); @@ -2971,7 +2973,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 433 "toke.l" +#line 435 "toke.l" { LEXTRACE("LOG_INPUT "); LEXRETURN(LOG_INPUT); @@ -2979,7 +2981,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 438 "toke.l" +#line 440 "toke.l" { LEXTRACE("NOLOG_INPUT "); LEXRETURN(NOLOG_INPUT); @@ -2987,7 +2989,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 443 "toke.l" +#line 445 "toke.l" { LEXTRACE("MAIL "); LEXRETURN(MAIL); @@ -2995,7 +2997,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 448 "toke.l" +#line 450 "toke.l" { LEXTRACE("NOMAIL "); LEXRETURN(NOMAIL); @@ -3003,7 +3005,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 453 "toke.l" +#line 455 "toke.l" { LEXTRACE("FOLLOW "); LEXRETURN(FOLLOWLNK); @@ -3011,7 +3013,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 458 "toke.l" +#line 460 "toke.l" { LEXTRACE("NOFOLLOW "); LEXRETURN(NOFOLLOWLNK); @@ -3019,7 +3021,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 463 "toke.l" +#line 465 "toke.l" { /* empty group or netgroup */ LEXTRACE("ERROR "); @@ -3028,7 +3030,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 469 "toke.l" +#line 471 "toke.l" { /* netgroup */ if (!fill(sudoerstext, sudoersleng)) @@ -3039,7 +3041,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 477 "toke.l" +#line 479 "toke.l" { /* group */ if (!fill(sudoerstext, sudoersleng)) @@ -3050,7 +3052,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 485 "toke.l" +#line 487 "toke.l" { if (!fill(sudoerstext, sudoersleng)) yyterminate(); @@ -3060,7 +3062,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 492 "toke.l" +#line 494 "toke.l" { if (!fill(sudoerstext, sudoersleng)) yyterminate(); @@ -3070,7 +3072,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 499 "toke.l" +#line 501 "toke.l" { if (!ipv6_valid(sudoerstext)) { LEXTRACE("ERROR "); @@ -3084,7 +3086,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 510 "toke.l" +#line 512 "toke.l" { if (!ipv6_valid(sudoerstext)) { LEXTRACE("ERROR "); @@ -3098,7 +3100,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 521 "toke.l" +#line 523 "toke.l" { LEXTRACE("ALL "); LEXRETURN(ALL); @@ -3107,7 +3109,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 527 "toke.l" +#line 529 "toke.l" { LEXTRACE("CMND_TIMEOUT "); LEXRETURN(CMND_TIMEOUT); @@ -3115,7 +3117,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 532 "toke.l" +#line 534 "toke.l" { LEXTRACE("NOTBEFORE "); LEXRETURN(NOTBEFORE); @@ -3123,7 +3125,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 537 "toke.l" +#line 539 "toke.l" { LEXTRACE("NOTAFTER "); LEXRETURN(NOTAFTER); @@ -3131,7 +3133,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 542 "toke.l" +#line 544 "toke.l" { #ifdef HAVE_SELINUX LEXTRACE("ROLE "); @@ -3143,7 +3145,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 551 "toke.l" +#line 553 "toke.l" { #ifdef HAVE_SELINUX LEXTRACE("TYPE "); @@ -3155,7 +3157,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 559 "toke.l" +#line 561 "toke.l" { #ifdef HAVE_PRIV_SET LEXTRACE("PRIVS "); @@ -3167,7 +3169,7 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 568 "toke.l" +#line 570 "toke.l" { #ifdef HAVE_PRIV_SET LEXTRACE("LIMITPRIVS "); @@ -3179,7 +3181,7 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP -#line 577 "toke.l" +#line 579 "toke.l" { got_alias: if (!fill(sudoerstext, sudoersleng)) @@ -3190,7 +3192,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP -#line 585 "toke.l" +#line 587 "toke.l" { /* XXX - no way to specify digest for command */ /* no command args allowed for Defaults!/path */ @@ -3202,7 +3204,7 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 594 "toke.l" +#line 596 "toke.l" { digest_type = SUDO_DIGEST_SHA224; BEGIN WANTDIGEST; @@ -3212,7 +3214,7 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 601 "toke.l" +#line 603 "toke.l" { digest_type = SUDO_DIGEST_SHA256; BEGIN WANTDIGEST; @@ -3222,7 +3224,7 @@ YY_RULE_SETUP YY_BREAK case 57: YY_RULE_SETUP -#line 608 "toke.l" +#line 610 "toke.l" { digest_type = SUDO_DIGEST_SHA384; BEGIN WANTDIGEST; @@ -3232,7 +3234,7 @@ YY_RULE_SETUP YY_BREAK case 58: YY_RULE_SETUP -#line 615 "toke.l" +#line 617 "toke.l" { digest_type = SUDO_DIGEST_SHA512; BEGIN WANTDIGEST; @@ -3242,7 +3244,7 @@ YY_RULE_SETUP YY_BREAK case 59: YY_RULE_SETUP -#line 622 "toke.l" +#line 624 "toke.l" { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -3252,7 +3254,7 @@ YY_RULE_SETUP YY_BREAK case 60: YY_RULE_SETUP -#line 629 "toke.l" +#line 631 "toke.l" { /* directories can't have args... */ if (sudoerstext[sudoersleng - 1] == '/') { @@ -3270,7 +3272,7 @@ YY_RULE_SETUP YY_BREAK case 61: YY_RULE_SETUP -#line 644 "toke.l" +#line 646 "toke.l" { LEXTRACE("BEGINSTR "); sudoerslval.string = NULL; @@ -3280,7 +3282,7 @@ YY_RULE_SETUP YY_BREAK case 62: YY_RULE_SETUP -#line 651 "toke.l" +#line 653 "toke.l" { /* a word */ if (!fill(sudoerstext, sudoersleng)) @@ -3291,7 +3293,7 @@ YY_RULE_SETUP YY_BREAK case 63: YY_RULE_SETUP -#line 659 "toke.l" +#line 661 "toke.l" { LEXTRACE("( "); LEXRETURN('('); @@ -3299,7 +3301,7 @@ YY_RULE_SETUP YY_BREAK case 64: YY_RULE_SETUP -#line 664 "toke.l" +#line 666 "toke.l" { LEXTRACE(") "); LEXRETURN(')'); @@ -3307,7 +3309,7 @@ YY_RULE_SETUP YY_BREAK case 65: YY_RULE_SETUP -#line 669 "toke.l" +#line 671 "toke.l" { LEXTRACE(", "); LEXRETURN(','); @@ -3315,7 +3317,7 @@ YY_RULE_SETUP YY_BREAK case 66: YY_RULE_SETUP -#line 674 "toke.l" +#line 676 "toke.l" { LEXTRACE("= "); LEXRETURN('='); @@ -3323,7 +3325,7 @@ YY_RULE_SETUP YY_BREAK case 67: YY_RULE_SETUP -#line 679 "toke.l" +#line 681 "toke.l" { LEXTRACE(": "); LEXRETURN(':'); @@ -3331,7 +3333,7 @@ YY_RULE_SETUP YY_BREAK case 68: YY_RULE_SETUP -#line 684 "toke.l" +#line 686 "toke.l" { if (sudoersleng & 1) { LEXTRACE("!"); @@ -3342,7 +3344,7 @@ YY_RULE_SETUP case 69: /* rule 69 can match eol */ YY_RULE_SETUP -#line 691 "toke.l" +#line 693 "toke.l" { if (YY_START == INSTR) { LEXTRACE("ERROR "); @@ -3357,7 +3359,7 @@ YY_RULE_SETUP YY_BREAK case 70: YY_RULE_SETUP -#line 703 "toke.l" +#line 705 "toke.l" { /* throw away space/tabs */ sawspace = true; /* but remember for fill_args */ } @@ -3365,7 +3367,7 @@ YY_RULE_SETUP case 71: /* rule 71 can match eol */ YY_RULE_SETUP -#line 707 "toke.l" +#line 709 "toke.l" { sawspace = true; /* remember for fill_args */ sudolineno++; @@ -3375,7 +3377,7 @@ YY_RULE_SETUP case 72: /* rule 72 can match eol */ YY_RULE_SETUP -#line 713 "toke.l" +#line 715 "toke.l" { if (sudoerstext[sudoersleng - 1] == '\n') { /* comment ending in a newline */ @@ -3392,7 +3394,7 @@ YY_RULE_SETUP YY_BREAK case 73: YY_RULE_SETUP -#line 727 "toke.l" +#line 729 "toke.l" { LEXTRACE("ERROR "); LEXRETURN(ERROR); @@ -3405,7 +3407,7 @@ case YY_STATE_EOF(STARTDEFS): case YY_STATE_EOF(INDEFS): case YY_STATE_EOF(INSTR): case YY_STATE_EOF(WANTDIGEST): -#line 732 "toke.l" +#line 734 "toke.l" { if (YY_START != INITIAL) { BEGIN INITIAL; @@ -3418,10 +3420,10 @@ case YY_STATE_EOF(WANTDIGEST): YY_BREAK case 74: YY_RULE_SETUP -#line 742 "toke.l" +#line 744 "toke.l" ECHO; YY_BREAK -#line 3419 "toke.c" +#line 3421 "toke.c" case YY_END_OF_BUFFER: { @@ -4382,7 +4384,7 @@ void sudoersfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 742 "toke.l" +#line 744 "toke.l" struct path_list { diff --git a/plugins/sudoers/toke.h b/plugins/sudoers/toke.h index 6c75840d5..575697904 100644 --- a/plugins/sudoers/toke.h +++ b/plugins/sudoers/toke.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2013, 2015-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l index 91d90cfd6..204b61d11 100644 --- a/plugins/sudoers/toke.l +++ b/plugins/sudoers/toke.l @@ -1,5 +1,7 @@ %{ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2017 * Todd C. Miller * diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c index 0c9137680..c7360385f 100644 --- a/plugins/sudoers/toke_util.c +++ b/plugins/sudoers/toke_util.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2016 * Todd C. Miller * diff --git a/plugins/sudoers/tsdump.c b/plugins/sudoers/tsdump.c index f2f8fc6db..c103a3ff2 100644 --- a/plugins/sudoers/tsdump.c +++ b/plugins/sudoers/tsdump.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2018-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c index a500bdf08..282046591 100644 --- a/plugins/sudoers/tsgetgrpw.c +++ b/plugins/sudoers/tsgetgrpw.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2005, 2008, 2010-2015 * Todd C. Miller * diff --git a/plugins/sudoers/tsgetgrpw.h b/plugins/sudoers/tsgetgrpw.h index c0e008c2e..a2d6e1042 100644 --- a/plugins/sudoers/tsgetgrpw.h +++ b/plugins/sudoers/tsgetgrpw.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c index 50dda5980..ade2dee81 100644 --- a/plugins/sudoers/visudo.c +++ b/plugins/sudoers/visudo.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2018 * Todd C. Miller * diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in index 6fbb79568..cfff84d21 100644 --- a/plugins/system_group/Makefile.in +++ b/plugins/system_group/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2011-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/plugins/system_group/system_group.c b/plugins/system_group/system_group.c index b34dea496..d1fa6e46d 100644 --- a/plugins/system_group/system_group.c +++ b/plugins/system_group/system_group.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/Makefile.in b/src/Makefile.in index 099193cfd..7a9ab6be8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: ISC +# # Copyright (c) 2010-2018 Todd C. Miller # # Permission to use, copy, modify, and distribute this software for any diff --git a/src/conversation.c b/src/conversation.c index fccb3d6f4..d78e1b89f 100644 --- a/src/conversation.c +++ b/src/conversation.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1999-2005, 2007-2012 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/env_hooks.c b/src/env_hooks.c index 8a0b26c5c..ab11c10f0 100644 --- a/src/env_hooks.c +++ b/src/env_hooks.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010, 2012-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/exec.c b/src/exec.c index 28d847d33..8acbf9ec1 100644 --- a/src/exec.c +++ b/src/exec.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/exec_common.c b/src/exec_common.c index 53abdbf49..7b5a0886f 100644 --- a/src/exec_common.c +++ b/src/exec_common.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/exec_monitor.c b/src/exec_monitor.c index 66afd3df1..929e9f230 100644 --- a/src/exec_monitor.c +++ b/src/exec_monitor.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/exec_nopty.c b/src/exec_nopty.c index dd7ba6c42..1ba569787 100644 --- a/src/exec_nopty.c +++ b/src/exec_nopty.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/exec_pty.c b/src/exec_pty.c index eb1e36f55..450a73f56 100644 --- a/src/exec_pty.c +++ b/src/exec_pty.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/get_pty.c b/src/get_pty.c index 3e1a26ac1..968e4cdfc 100644 --- a/src/get_pty.c +++ b/src/get_pty.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2012, 2014-2016 * Todd C. Miller * diff --git a/src/hooks.c b/src/hooks.c index 12169805f..97b114f9a 100644 --- a/src/hooks.c +++ b/src/hooks.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/load_plugins.c b/src/load_plugins.c index dadf4edcb..699f58a09 100644 --- a/src/load_plugins.c +++ b/src/load_plugins.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/net_ifs.c b/src/net_ifs.c index 82610d8ed..d218a0524 100644 --- a/src/net_ifs.c +++ b/src/net_ifs.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2015, 2018 * Todd C. Miller * diff --git a/src/openbsd.c b/src/openbsd.c index fd0e2f392..ed0d021eb 100644 --- a/src/openbsd.c +++ b/src/openbsd.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/parse_args.c b/src/parse_args.c index d9bbe0650..8efb6ce92 100644 --- a/src/parse_args.c +++ b/src/parse_args.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996, 1998-2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/preload.c b/src/preload.c index e9f83ee5e..9b8a38762 100644 --- a/src/preload.c +++ b/src/preload.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010, 2011, 2013 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/preserve_fds.c b/src/preserve_fds.c index 1de01ad88..21674acea 100644 --- a/src/preserve_fds.c +++ b/src/preserve_fds.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/regress/noexec/check_noexec.c b/src/regress/noexec/check_noexec.c index e83f42095..e617bb277 100644 --- a/src/regress/noexec/check_noexec.c +++ b/src/regress/noexec/check_noexec.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/regress/ttyname/check_ttyname.c b/src/regress/ttyname/check_ttyname.c index 1609cd096..f9de1eb4b 100644 --- a/src/regress/ttyname/check_ttyname.c +++ b/src/regress/ttyname/check_ttyname.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2013-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/selinux.c b/src/selinux.c index ed36d8964..e56be9e17 100644 --- a/src/selinux.c +++ b/src/selinux.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2016 Todd C. Miller * Copyright (c) 2008 Dan Walsh * diff --git a/src/sesh.c b/src/sesh.c index 873748e4c..8a9549c8e 100644 --- a/src/sesh.c +++ b/src/sesh.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2008, 2010-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/signal.c b/src/signal.c index 5c6022555..efae397c5 100644 --- a/src/signal.c +++ b/src/signal.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/solaris.c b/src/solaris.c index 8e2fceee8..bc6f063b7 100644 --- a/src/solaris.c +++ b/src/solaris.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/sudo.c b/src/sudo.c index 8b7cde85f..211d2ebb2 100644 --- a/src/sudo.c +++ b/src/sudo.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2009-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/sudo.h b/src/sudo.h index b575f04e3..6f8eded88 100644 --- a/src/sudo.h +++ b/src/sudo.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1993-1996, 1998-2005, 2007-2016 * Todd C. Miller * diff --git a/src/sudo_edit.c b/src/sudo_edit.c index 44b4fb3b0..0a25beec4 100644 --- a/src/sudo_edit.c +++ b/src/sudo_edit.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2008, 2010-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/sudo_exec.h b/src/sudo_exec.h index c8c79417c..3a75a7c80 100644 --- a/src/sudo_exec.h +++ b/src/sudo_exec.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2016 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/sudo_noexec.c b/src/sudo_noexec.c index c103d5fe4..336ae8552 100644 --- a/src/sudo_noexec.c +++ b/src/sudo_noexec.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004-2005, 2010-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/sudo_plugin_int.h b/src/sudo_plugin_int.h index c5fce3406..3b85a4826 100644 --- a/src/sudo_plugin_int.h +++ b/src/sudo_plugin_int.h @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2010-2014 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/sudo_usage.h.in b/src/sudo_usage.h.in index 95ae89302..d37c49a4f 100644 --- a/src/sudo_usage.h.in +++ b/src/sudo_usage.h.in @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2007-2010, 2013, 2015, 2017 * Todd C. Miller * diff --git a/src/tcsetpgrp_nobg.c b/src/tcsetpgrp_nobg.c index 03e95c8e4..3c888b814 100644 --- a/src/tcsetpgrp_nobg.c +++ b/src/tcsetpgrp_nobg.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2017 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/tgetpass.c b/src/tgetpass.c index 76b0c8bae..a59bc468d 100644 --- a/src/tgetpass.c +++ b/src/tgetpass.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1996, 1998-2005, 2007-2018 * Todd C. Miller * diff --git a/src/ttyname.c b/src/ttyname.c index d1b78d4bf..25aaa1461 100644 --- a/src/ttyname.c +++ b/src/ttyname.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2012-2019 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any diff --git a/src/utmp.c b/src/utmp.c index b371bbf2a..3afbcb3fc 100644 --- a/src/utmp.c +++ b/src/utmp.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 2011-2018 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any