aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/bsdlabel/pathnames.h4
-rw-r--r--sbin/clri/clri.c4
-rw-r--r--sbin/devd/devd.cc2
-rw-r--r--sbin/dhclient/alloc.c4
-rw-r--r--sbin/dhclient/bpf.c4
-rw-r--r--sbin/dhclient/clparse.c4
-rw-r--r--sbin/dhclient/conflex.c4
-rw-r--r--sbin/dhclient/convert.c4
-rw-r--r--sbin/dhclient/dhclient.c4
-rw-r--r--sbin/dhclient/dhcp.h4
-rw-r--r--sbin/dhclient/dhcpd.h4
-rw-r--r--sbin/dhclient/dhctoken.h6
-rw-r--r--sbin/dhclient/dispatch.c4
-rw-r--r--sbin/dhclient/errwarn.c4
-rw-r--r--sbin/dhclient/hash.c4
-rw-r--r--sbin/dhclient/inet.c4
-rw-r--r--sbin/dhclient/options.c4
-rw-r--r--sbin/dhclient/packet.c4
-rw-r--r--sbin/dhclient/parse.c4
-rw-r--r--sbin/dhclient/tables.c4
-rw-r--r--sbin/dhclient/tree.c4
-rw-r--r--sbin/dhclient/tree.h6
-rw-r--r--sbin/dmesg/dmesg.c2
-rw-r--r--sbin/dump/dump.h2
-rw-r--r--sbin/dump/dumprmt.c2
-rw-r--r--sbin/dump/itime.c2
-rw-r--r--sbin/dump/main.c2
-rw-r--r--sbin/dump/optr.c2
-rw-r--r--sbin/dump/pathnames.h4
-rw-r--r--sbin/dump/tape.c2
-rw-r--r--sbin/dump/traverse.c2
-rw-r--r--sbin/dump/unctime.c2
-rw-r--r--sbin/dumpfs/dumpfs.c2
-rw-r--r--sbin/dumpon/dumpon.c4
-rw-r--r--sbin/fsck/fsck.c4
-rw-r--r--sbin/fsck/fsutil.c4
-rw-r--r--sbin/fsck/preen.c4
-rw-r--r--sbin/fsck_ffs/dir.c4
-rw-r--r--sbin/fsck_ffs/fsck.h4
-rw-r--r--sbin/fsck_ffs/fsutil.c4
-rw-r--r--sbin/fsck_ffs/gjournal.c2
-rw-r--r--sbin/fsck_ffs/globs.c4
-rw-r--r--sbin/fsck_ffs/inode.c4
-rw-r--r--sbin/fsck_ffs/main.c4
-rw-r--r--sbin/fsck_ffs/pass1.c4
-rw-r--r--sbin/fsck_ffs/pass1b.c4
-rw-r--r--sbin/fsck_ffs/pass2.c4
-rw-r--r--sbin/fsck_ffs/pass3.c4
-rw-r--r--sbin/fsck_ffs/pass4.c4
-rw-r--r--sbin/fsck_ffs/pass5.c4
-rw-r--r--sbin/fsck_ffs/setup.c4
-rw-r--r--sbin/fsck_ffs/utilities.c4
-rw-r--r--sbin/ifconfig/af_inet.c4
-rw-r--r--sbin/ifconfig/af_inet6.c4
-rw-r--r--sbin/ifconfig/af_link.c4
-rw-r--r--sbin/ifconfig/ifclone.c4
-rw-r--r--sbin/ifconfig/ifconfig.c4
-rw-r--r--sbin/init/init.c2
-rw-r--r--sbin/init/pathnames.h2
-rw-r--r--sbin/mknod/mknod.c2
-rw-r--r--sbin/mount/getmntopts.c2
-rw-r--r--sbin/mount/mntopts.h2
-rw-r--r--sbin/mount/mount.c2
-rw-r--r--sbin/mount/mount_fs.c4
-rw-r--r--sbin/mount/pathnames.h4
-rw-r--r--sbin/mount/vfslist.c2
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c4
-rw-r--r--sbin/mount_nfs/mount_nfs.c4
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c4
-rw-r--r--sbin/mount_udf/mount_udf.c4
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c2
-rw-r--r--sbin/newfs/mkfs.c4
-rw-r--r--sbin/newfs/newfs.c4
-rw-r--r--sbin/newfs/newfs.h4
-rw-r--r--sbin/nfsiod/nfsiod.c4
-rw-r--r--sbin/ping/ping.c4
-rw-r--r--sbin/ping6/ping6.c4
-rw-r--r--sbin/quotacheck/preen.c4
-rw-r--r--sbin/quotacheck/quotacheck.c4
-rw-r--r--sbin/quotacheck/quotacheck.h4
-rw-r--r--sbin/reboot/reboot.c4
-rw-r--r--sbin/restore/dirs.c4
-rw-r--r--sbin/restore/extern.h2
-rw-r--r--sbin/restore/interactive.c4
-rw-r--r--sbin/restore/main.c4
-rw-r--r--sbin/restore/restore.c4
-rw-r--r--sbin/restore/restore.h2
-rw-r--r--sbin/restore/symtab.c4
-rw-r--r--sbin/restore/tape.c4
-rw-r--r--sbin/restore/utilities.c4
-rw-r--r--sbin/route/route.c4
-rw-r--r--sbin/routed/defs.h4
-rw-r--r--sbin/routed/if.c4
-rw-r--r--sbin/routed/input.c4
-rw-r--r--sbin/routed/main.c4
-rw-r--r--sbin/routed/output.c4
-rw-r--r--sbin/routed/parms.c4
-rw-r--r--sbin/routed/pathnames.h4
-rw-r--r--sbin/routed/radix.c4
-rw-r--r--sbin/routed/radix.h4
-rw-r--r--sbin/routed/rdisc.c4
-rw-r--r--sbin/routed/rtquery/rtquery.c2
-rw-r--r--sbin/routed/table.c4
-rw-r--r--sbin/routed/trace.c4
-rw-r--r--sbin/savecore/savecore.c2
-rw-r--r--sbin/setkey/parse.y4
-rw-r--r--sbin/setkey/setkey.c4
-rw-r--r--sbin/setkey/test-pfkey.c4
-rw-r--r--sbin/setkey/test-policy.c4
-rw-r--r--sbin/setkey/token.l4
-rw-r--r--sbin/setkey/vchar.h4
-rw-r--r--sbin/shutdown/shutdown.c4
-rw-r--r--sbin/sunlabel/sunlabel.c4
-rw-r--r--sbin/swapon/swapon.c2
-rw-r--r--sbin/sysctl/sysctl.c4
-rw-r--r--sbin/tunefs/tunefs.c4
-rw-r--r--sbin/umount/umount.c2
117 files changed, 329 insertions, 91 deletions
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index dcf0abb17bc4..77ee59e0279e 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.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/sbin/clri/clri.c b/sbin/clri/clri.c
index 6996c9b9e0de..7745aa56d18f 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index e6752772cb3f..1d80564c94c2 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2010 M. Warner Losh.
* All rights reserved.
*
diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index cd60ceca7d83..c3ea309a5456 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -2,7 +2,9 @@
/* Memory allocation... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 78b9eb624e88..a9da1f0a5a9f 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -2,7 +2,9 @@
/* BPF socket interface code, originally contributed by Archie Cobbs. */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1998, 1999
* The Internet Software Consortium. All rights reserved.
*
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index a03723f7256b..d765ec4f3e7d 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -2,7 +2,9 @@
/* Parser for dhclient config and lease files... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index cd57e3b44132..5dc73518c0b6 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -2,7 +2,9 @@
/* Lexical scanner for dhcpd config file... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index adca0929a07c..c30195254d4b 100644
--- a/sbin/dhclient/convert.c
+++ b/sbin/dhclient/convert.c
@@ -5,7 +5,9 @@
* which can't be assumed to be aligned.
*/
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 4f44303a0404..6817f0b12f39 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,6 +1,8 @@
/* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index 6e7d1a743bc9..e4dcfb93271e 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -3,7 +3,9 @@
/* Protocol structures... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 9d80fc253676..3fd51ee36720 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,6 +1,8 @@
/* $OpenBSD: dhcpd.h,v 1.33 2004/05/06 22:29:15 deraadt Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
diff --git a/sbin/dhclient/dhctoken.h b/sbin/dhclient/dhctoken.h
index 7b23242fbac0..26c81aa734dc 100644
--- a/sbin/dhclient/dhctoken.h
+++ b/sbin/dhclient/dhctoken.h
@@ -2,7 +2,9 @@
/* Tokens for config file lexer and parser. */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
*
@@ -38,6 +40,8 @@
* Enterprises. To learn more about the Internet Software Consortium,
* see ``http://www.vix.com/isc''. To learn more about Vixie
* Enterprises, see ``http://www.vix.com''.
+ *
+ * $FreeBSD$
*/
#define SEMI ';'
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 51d5c7af04c5..9a4f82fb6fa4 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,6 +1,8 @@
/* $OpenBSD: dispatch.c,v 1.31 2004/09/21 04:07:03 david Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 1995, 1996, 1997, 1998, 1999
* The Internet Software Consortium. All rights reserved.
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index 596505e21d55..f6c247a87677 100644
--- a/sbin/dhclient/errwarn.c
+++ b/sbin/dhclient/errwarn.c
@@ -2,7 +2,9 @@
/* Errors and warnings... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 The Internet Software Consortium.
* All Rights Reserved.
* Copyright (c) 1995 RadioMail Corporation. All rights reserved.
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 040236ab735b..d16a3e66d857 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -2,7 +2,9 @@
/* Routines for manipulating hash tables... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index 4b7b1cef1bad..759d69387d4d 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -5,7 +5,9 @@
* way...
*/
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 The Internet Software Consortium. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index fe025e6d6a40..8098d706e061 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -2,7 +2,9 @@
/* DHCP options parsing and reassembly. */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 859f48b1a66a..ee549e9d8a2b 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -2,7 +2,9 @@
/* Packet assembly code, originally contributed by Archie Cobbs. */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1999 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index c96e18d0e1b6..cf37dc055aa3 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -2,7 +2,9 @@
/* Common parser code for dhcpd and dhclient. */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 1dcace9bdb04..8fd2199da6a2 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -2,7 +2,9 @@
/* Tables of information... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 0ed2919bb314..caf8ca1d71d8 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -2,7 +2,9 @@
/* Routines for manipulating parse trees... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
* All rights reserved.
*
diff --git a/sbin/dhclient/tree.h b/sbin/dhclient/tree.h
index 04e08e7c820c..9fdcc0d3b772 100644
--- a/sbin/dhclient/tree.h
+++ b/sbin/dhclient/tree.h
@@ -2,7 +2,9 @@
/* Definitions for address trees... */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 The Internet Software Consortium. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,6 +39,8 @@
* Enterprises. To learn more about the Internet Software Consortium,
* see ``http://www.vix.com/isc''. To learn more about Vixie
* Enterprises, see ``http://www.vix.com''.
+ *
+ * $FreeBSD$
*/
/* A pair of pointers, suitable for making a linked list. */
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index a25b7352a922..469582204f7b 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -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/sbin/dump/dump.h b/sbin/dump/dump.h
index 6097a30a7b42..f935fab26b88 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 87f3e4d4494d..66a80bbd9f0b 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 1c7066a5e772..93ae6a2180e4 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index f56092de7305..91179dd54487 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 49b8a6427ac4..8eb163516c72 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index c1a7ab5fccf0..6f56aeff7a51 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.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/sbin/dump/tape.c b/sbin/dump/tape.c
index 5fd1b04491a0..2bddb40bffc7 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index d1f92b507778..c501f985521a 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1988, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index bcc9affed216..3e03a65f1a7c 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index e163b4b69747..87e28366a1a0 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
*
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 8530c63b889d..19fdb3f5d572 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 728acee4f52b..7895ee7b6557 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,6 +1,8 @@
/* $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 348b288ed216..06e7e96ea465 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -1,6 +1,8 @@
/* $NetBSD: fsutil.c,v 1.15 2006/06/05 16:52:05 christos Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 2a7b2e1afee1..e40ec5d4fb91 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -1,6 +1,8 @@
/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index e4094d34cbc0..212833cb1f42 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index c40a4c445895..e559d6cc833f 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause and BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 16d960d155af..f426200be118 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index 95cec30412db..ea972dafe916 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c
index 1aacec1ddf85..f3522973404e 100644
--- a/sbin/fsck_ffs/globs.c
+++ b/sbin/fsck_ffs/globs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index d3c95996ed52..67c8440a2013 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 32082c1c126f..70b144fd6c9f 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 963f43fb52c5..40d855896f06 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index 7d40fb79c660..4db754371b0b 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 3c4109160d76..c543cc0e561d 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 83e8237501c3..38eb9a4cdfc6 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index ee99c451a182..f48bc041af10 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index f544cc79079a..3f8c49a8e1c7 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 62e27053a2b8..64abc40b369b 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 32c78ff7c15b..75617240f0f9 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index a83d091f857d..d2a6dcb77146 100644
--- a/sbin/ifconfig/af_inet.c
+++ b/sbin/ifconfig/af_inet.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index e93d94355eb8..217bfd52a985 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c
index 88f29c380d22..f83359da0b2b 100644
--- a/sbin/ifconfig/af_link.c
+++ b/sbin/ifconfig/af_link.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/ifclone.c b/sbin/ifconfig/ifclone.c
index b81e8d26af8b..5e23501ae03c 100644
--- a/sbin/ifconfig/ifclone.c
+++ b/sbin/ifconfig/ifclone.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 964a70e1022e..ca401adc6add 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/init/init.c b/sbin/init/init.c
index e6fcdb93ef3e..e0ec7cd891ea 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -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/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 380ccb59d76f..2ed366e4f7f7 100644
--- a/sbin/init/pathnames.h
+++ b/sbin/init/pathnames.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/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index bd7f37af578b..be7c97cf06fb 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -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/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 8fd0f96296c7..fb739c6406ae 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index d9f0f1e5eec1..418bf8012232 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 8b600e1f8cba..b0b1c0bd071f 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index 9ac2d43f3ebe..5674e94594bf 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index f2a2b7fb8150..7dfb3f1a30e0 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index 8acddc28e5be..d6a42e61d8b4 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 272d3376ef4c..f322ac73a439 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 93f6a9cb8347..473370ee0209 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index 947770b8bb6a..e62f60bd022d 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index ef4098007bf5..3f612cbc2fab 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2002 Scott Long
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 445f5209b190..9aafaf13d81f 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California.
* Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc.
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 957a3674e7c6..e6aab91c2fd1 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 8b32792c3c83..30ea9e53396a 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 7000abc49d28..cebb1d999462 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 6526a67d26df..b518d94d384c 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -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/sbin/ping/ping.c b/sbin/ping/ping.c
index 032c911207a4..492e21cbb8f9 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -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/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 3b281e9f1bc6..b41d0e07df73 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,6 +1,8 @@
/* $KAME: ping6.c,v 1.169 2003/07/25 06:01:47 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index ae2792cb4bb9..26cfa4513fd6 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -1,6 +1,8 @@
/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 30fbe8723730..c7582b09dc53 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/quotacheck/quotacheck.h b/sbin/quotacheck/quotacheck.h
index f0ea6bcc132a..2699e4707fe9 100644
--- a/sbin/quotacheck/quotacheck.h
+++ b/sbin/quotacheck/quotacheck.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 01c7d38da5a9..87abb6517445 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index beab1aeb5a1e..a8120fda8b6e 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index ecd9bd59253c..c33034c48c5e 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 26a4ca323e2a..15b1fb45bb04 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index db0b0334ab3f..7b9a5359d57d 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 4b4b574469f3..7c9056ee16d9 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index bb41a63484da..819f49d51216 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 9a9b06189c0a..49ed39dd2022 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 8b1b37ee14d2..04cda7ebd636 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 5615fd3cc7ff..a53d42f9e600 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 062fecd3cc3b..6c41c853b5c9 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 24b07df8199f..5ce7b5be3b16 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index bc5b5d50e5e4..af02b9e87391 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index dc23b46ca63f..116d15ca7437 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 6a888ae3b7a4..45b150653041 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index e7b255bff2bb..7d5b1e4131a6 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index b73bf9b76ebc..ef501b043244 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index 74a1ef2312e3..fff6de671cfa 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.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/sbin/routed/radix.c b/sbin/routed/radix.c
index a76d8e5318f2..0f3ef39ec213 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index e9d2b3ea44c7..4bbd70359331 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 7d4785ba4e8a..b8b02d7b9e1a 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 5f2580064c81..883c51fabc68 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index fe719cd31d29..04b2f79f5e08 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 92d51a5a5288..5fe4a97c2146 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index d037ae2912f1..14257421361c 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y
index f336c5d489fd..ae0859c22d2c 100644
--- a/sbin/setkey/parse.y
+++ b/sbin/setkey/parse.y
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $KAME: parse.y,v 1.83 2004/05/18 08:48:23 sakane Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index e4525ee50d1b..1d66a92e0100 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $KAME: setkey.c,v 1.28 2003/06/27 07:15:45 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/test-pfkey.c b/sbin/setkey/test-pfkey.c
index d3af16217ed9..aead9d851dd0 100644
--- a/sbin/setkey/test-pfkey.c
+++ b/sbin/setkey/test-pfkey.c
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/test-policy.c b/sbin/setkey/test-policy.c
index 9749dd3e4966..3bf5c8975171 100644
--- a/sbin/setkey/test-policy.c
+++ b/sbin/setkey/test-policy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index 7f30859e3861..358f87a63b80 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/setkey/vchar.h b/sbin/setkey/vchar.h
index f3251c7bfed3..c7e96cb9ca1a 100644
--- a/sbin/setkey/vchar.h
+++ b/sbin/setkey/vchar.h
@@ -1,7 +1,9 @@
/* $FreeBSD$ */
/* $KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
*
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index f1f780e5d1e8..c8e77883f6be 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index c79e213b686e..d1d5cea42d45 100644
--- a/sbin/sunlabel/sunlabel.c
+++ b/sbin/sunlabel/sunlabel.c
@@ -24,7 +24,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994, 1995 Gordon W. Ross
* Copyright (c) 1994 Theo de Raadt
* All rights reserved.
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index f11f0d664fef..83201535b4ab 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 51ae95809a11..e1bf4e319149 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 9dd20615d77e..e3d972bceb57 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index f2829a4f9429..9e8c71d0f1f6 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1980, 1989, 1993
* The Regents of the University of California. All rights reserved.
*