diff options
| author | eadler <eadler@FreeBSD.org> | 2018-03-29 02:50:57 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2018-03-29 02:50:57 +0000 |
| commit | cc72c823b60e2b6c75664545cf46e07f6b40d94a (patch) | |
| tree | f64a2aebb1ac9925d884f8e87440e4fff3bfb5ee /sbin | |
| parent | dd2b5d7309ab212f7aa37c7402a95935137d1a1a (diff) | |
| download | FreeBSD-src-cc72c823b60e2b6c75664545cf46e07f6b40d94a.zip FreeBSD-src-cc72c823b60e2b6c75664545cf46e07f6b40d94a.tar.gz | |
Revert r330897:
This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.
Revert with prejudice.
This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.
Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.
Requested by: gjb (re)
Diffstat (limited to 'sbin')
127 files changed, 100 insertions, 354 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index af91dcc..072c4cf 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -1,6 +1,4 @@ -/*- - * 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/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h index 4df0589..c8a9ef3 100644 --- a/sbin/bsdlabel/pathnames.h +++ b/sbin/bsdlabel/pathnames.h @@ -1,6 +1,4 @@ -/*- - * 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 23f28c7..ff41d1a 100644 --- a/sbin/clri/clri.c +++ b/sbin/clri/clri.c @@ -1,6 +1,4 @@ -/*- - * 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 64cf637..8757f62 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1,6 +1,4 @@ /*- - * 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 c3ea309..cd60cec 100644 --- a/sbin/dhclient/alloc.c +++ b/sbin/dhclient/alloc.c @@ -2,9 +2,7 @@ /* 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 a9da1f0..78b9eb6 100644 --- a/sbin/dhclient/bpf.c +++ b/sbin/dhclient/bpf.c @@ -2,9 +2,7 @@ /* 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 ac80db5..16aeb8f 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -2,9 +2,7 @@ /* 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 480f992..7211339 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -2,9 +2,7 @@ /* 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 c301952..adca092 100644 --- a/sbin/dhclient/convert.c +++ b/sbin/dhclient/convert.c @@ -5,9 +5,7 @@ * 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 c0332b9..12719e8 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,8 +1,6 @@ /* $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 e4dcfb9..6e7d1a7 100644 --- a/sbin/dhclient/dhcp.h +++ b/sbin/dhclient/dhcp.h @@ -3,9 +3,7 @@ /* 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 e44a98c..a729051 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,8 +1,6 @@ /* $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/dispatch.c b/sbin/dhclient/dispatch.c index 327ecaf..a2f5eef 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -1,8 +1,6 @@ /* $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 1a70fc3..5720780 100644 --- a/sbin/dhclient/errwarn.c +++ b/sbin/dhclient/errwarn.c @@ -2,9 +2,7 @@ /* 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 d16a3e6..040236a 100644 --- a/sbin/dhclient/hash.c +++ b/sbin/dhclient/hash.c @@ -2,9 +2,7 @@ /* 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 c72a7f6..1e46407 100644 --- a/sbin/dhclient/inet.c +++ b/sbin/dhclient/inet.c @@ -5,9 +5,7 @@ * 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 e0515f3..d88ab7f 100644 --- a/sbin/dhclient/options.c +++ b/sbin/dhclient/options.c @@ -2,9 +2,7 @@ /* 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 2328d57..034c39b 100644 --- a/sbin/dhclient/packet.c +++ b/sbin/dhclient/packet.c @@ -2,9 +2,7 @@ /* 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 d82d598..398cb26 100644 --- a/sbin/dhclient/parse.c +++ b/sbin/dhclient/parse.c @@ -2,9 +2,7 @@ /* 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 062eacc..c7bac57 100644 --- a/sbin/dhclient/tables.c +++ b/sbin/dhclient/tables.c @@ -2,9 +2,7 @@ /* 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 9639cb8..dc0e064 100644 --- a/sbin/dhclient/tree.c +++ b/sbin/dhclient/tree.c @@ -2,9 +2,7 @@ /* 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/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 4113209..827ed8e 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -1,6 +1,4 @@ /*- - * 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 528b7fc..4a8af10 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -1,6 +1,4 @@ /*- - * 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 6b8b839..dd02642 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -1,6 +1,4 @@ /*- - * 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 f01889e..e57faa5 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -1,6 +1,4 @@ /*- - * 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 b7c59a4..ee02728 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,6 +1,4 @@ /*- - * 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 83bea1f..bffcdc8 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -1,6 +1,4 @@ /*- - * 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 6cd3cfd..eb3ce39 100644 --- a/sbin/dump/pathnames.h +++ b/sbin/dump/pathnames.h @@ -1,6 +1,4 @@ -/*- - * 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 8d49f3e..ff4e397 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -1,6 +1,4 @@ /*- - * 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 7643b3b..2aa0305 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,6 +1,4 @@ /*- - * 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 f84d9fd..3720ebf 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -1,6 +1,4 @@ /*- - * 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 245f3b8..ab76db6 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -1,6 +1,4 @@ /* - * 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 81f1ce9..8407111 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -1,6 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - * +/* * Copyright (c) 1980, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/sbin/etherswitchcfg/ifmedia.c b/sbin/etherswitchcfg/ifmedia.c index fd2a7fb..b9bd3b9 100644 --- a/sbin/etherswitchcfg/ifmedia.c +++ b/sbin/etherswitchcfg/ifmedia.c @@ -1,9 +1,7 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ /* $FreeBSD$ */ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1997 Jason R. Thorpe. * All rights reserved. * diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c index 6b0b039..c1e7c87 100644 --- a/sbin/ffsinfo/ffsinfo.c +++ b/sbin/ffsinfo/ffsinfo.c @@ -1,6 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz * Copyright (c) 1980, 1989, 1993 The Regents of the University of California. * All rights reserved. diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 7895ee7..728acee 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -1,8 +1,6 @@ /* $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 4fb0750..935992e 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -1,8 +1,6 @@ /* $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 967e0b2..d367eb2 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -1,8 +1,6 @@ /* $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 775aa43..6043497 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -1,6 +1,4 @@ -/*- - * 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 ab05b12..12f863a 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -1,6 +1,4 @@ -/*- - * 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 77b2f54..52a982f 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -1,6 +1,4 @@ -/*- - * 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 7fa33ae..ba8dc34 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -1,6 +1,4 @@ /*- - * 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 41315e6..a642249 100644 --- a/sbin/fsck_ffs/globs.c +++ b/sbin/fsck_ffs/globs.c @@ -1,6 +1,4 @@ -/*- - * 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 b3908ea..d13c5b2 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -1,6 +1,4 @@ -/*- - * 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 ff8bc66..98cdafd 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -1,6 +1,4 @@ -/*- - * 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 032cfe8..515dffe 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -1,6 +1,4 @@ -/*- - * 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 c61f02f..52f7479 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -1,6 +1,4 @@ -/*- - * 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 0d73202..36a41ac 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -1,6 +1,4 @@ -/*- - * 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 782822c..22309cb 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -1,6 +1,4 @@ -/*- - * 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 a43033d..3b64dfb 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -1,6 +1,4 @@ -/*- - * 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 318800e..67ad68a 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -1,6 +1,4 @@ -/*- - * 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 341b081..69d4afc 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -1,6 +1,4 @@ -/*- - * 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 8f857c34..1a78cfd 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -1,6 +1,4 @@ -/*- - * 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/growfs/debug.c b/sbin/growfs/debug.c index 7774ae3..d371013 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -1,6 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz * Copyright (c) 1980, 1989, 1993 The Regents of the University of California. * All rights reserved. diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h index 068e89c..3cad9d9 100644 --- a/sbin/growfs/debug.h +++ b/sbin/growfs/debug.h @@ -1,6 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz * Copyright (c) 1980, 1989, 1993 The Regents of the University of California. * All rights reserved. diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index b71e415..a212d13 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -1,6 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1980, 1989, 1993 The Regents of the University of California. * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz * Copyright (c) 2012 The FreeBSD Foundation diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h index e9c112a..8b72eea 100644 --- a/sbin/gvinum/gvinum.h +++ b/sbin/gvinum/gvinum.h @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-4-Clause - * * Copyright (c) 1997, 1998 * Nan Yang Computer Services Limited. All rights reserved. * diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 68ac0a5..ed8419a 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -1,6 +1,4 @@ -/*- - * 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 2d99f0e..2c9c2f0 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -1,6 +1,4 @@ -/*- - * 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 148b9c7..c2aafa7 100644 --- a/sbin/ifconfig/af_link.c +++ b/sbin/ifconfig/af_link.c @@ -1,6 +1,4 @@ -/*- - * 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 8806722..21dcdc3 100644 --- a/sbin/ifconfig/ifclone.c +++ b/sbin/ifconfig/ifclone.c @@ -1,6 +1,4 @@ -/*- - * 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 1837d96..5fe5923 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,6 +1,4 @@ -/*- - * 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/ifmedia.c b/sbin/ifconfig/ifmedia.c index 983b0b7..c289193 100644 --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -1,9 +1,7 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ /* $FreeBSD$ */ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1997 Jason R. Thorpe. * All rights reserved. * diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index a29c50f..3b37160 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -1,6 +1,4 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1999 Bill Paul <wpaul@ctr.columbia.edu> * Copyright (c) 2012 ADARA Networks, Inc. * All rights reserved. diff --git a/sbin/init/init.c b/sbin/init/init.c index 724e6aa..f4206c4 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,6 +1,4 @@ /*- - * 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 8627d25..ec33b45 100644 --- a/sbin/init/pathnames.h +++ b/sbin/init/pathnames.h @@ -1,6 +1,4 @@ /*- - * 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 f6847ba..76bb2e5 100644 --- a/sbin/mknod/mknod.c +++ b/sbin/mknod/mknod.c @@ -1,6 +1,4 @@ /* - * 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 3e0d3b2..59a383e 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -1,6 +1,4 @@ /*- - * 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 430cbf4..4cb83f1 100644 --- a/sbin/mount/mntopts.h +++ b/sbin/mount/mntopts.h @@ -1,6 +1,4 @@ /*- - * 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 e7b678d..08ddc29 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,6 +1,4 @@ /*- - * 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 6591f2e..385cd0f 100644 --- a/sbin/mount/mount_fs.c +++ b/sbin/mount/mount_fs.c @@ -1,6 +1,4 @@ -/*- - * 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 715d837..aaa0a2c 100644 --- a/sbin/mount/pathnames.h +++ b/sbin/mount/pathnames.h @@ -1,6 +1,4 @@ -/*- - * 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 9f4b5a8..fa5fdf6 100644 --- a/sbin/mount/vfslist.c +++ b/sbin/mount/vfslist.c @@ -1,6 +1,4 @@ /*- - * 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 7fb9fab..7ea6064 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -1,6 +1,4 @@ -/*- - * 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 adfa7a3..9193337 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -1,6 +1,4 @@ -/*- - * 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 21edaff..e08599f 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -1,6 +1,4 @@ -/*- - * 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 34b9342..7585c50 100644 --- a/sbin/mount_udf/mount_udf.c +++ b/sbin/mount_udf/mount_udf.c @@ -1,6 +1,4 @@ -/*- - * 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 fb3fdf3..1026ecf 100644 --- a/sbin/mount_unionfs/mount_unionfs.c +++ b/sbin/mount_unionfs/mount_unionfs.c @@ -1,6 +1,4 @@ /*- - * 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 0dd95d9..b7af4d2 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,6 +1,4 @@ -/*- - * 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 6ba7c2c..5b92392 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,6 +1,4 @@ -/*- - * 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 475816e..72f4314 100644 --- a/sbin/newfs/newfs.h +++ b/sbin/newfs/newfs.h @@ -1,6 +1,4 @@ -/*- - * 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 0dd59ce..b1db1f1 100644 --- a/sbin/nfsiod/nfsiod.c +++ b/sbin/nfsiod/nfsiod.c @@ -1,6 +1,4 @@ -/*- - * 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 d0d3ba5..ab4764a 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,6 +1,4 @@ -/*- - * 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 3eb7327..51a154d 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,8 +1,6 @@ /* $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 4daf757..fd843e2 100644 --- a/sbin/quotacheck/preen.c +++ b/sbin/quotacheck/preen.c @@ -1,8 +1,6 @@ /* $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 69573d3..0ee5b09 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -1,6 +1,4 @@ -/*- - * 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 47f0542..dcff75b 100644 --- a/sbin/quotacheck/quotacheck.h +++ b/sbin/quotacheck/quotacheck.h @@ -1,6 +1,4 @@ -/*- - * 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/rcorder/ealloc.c b/sbin/rcorder/ealloc.c index eae8bb6..9971193 100644 --- a/sbin/rcorder/ealloc.c +++ b/sbin/rcorder/ealloc.c @@ -1,9 +1,7 @@ /* $FreeBSD$ */ /* $NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 1989 by Berkeley Softworks diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c index 3dcb770..34b95ce 100644 --- a/sbin/rcorder/hash.c +++ b/sbin/rcorder/hash.c @@ -1,9 +1,7 @@ /* $FreeBSD$ */ /* $NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks diff --git a/sbin/rcorder/hash.h b/sbin/rcorder/hash.h index d190633..fd2f978 100644 --- a/sbin/rcorder/hash.h +++ b/sbin/rcorder/hash.h @@ -1,9 +1,7 @@ /* $FreeBSD$ */ /* $NetBSD: hash.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * +/* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 15af9d0..51b7515 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -1,6 +1,4 @@ -/*- - * 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 8c337c8..57b0523 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -1,6 +1,4 @@ -/*- - * 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 5eb21d2..9b319ca 100644 --- a/sbin/restore/extern.h +++ b/sbin/restore/extern.h @@ -1,6 +1,4 @@ /*- - * 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 43fa2d5..6f4c02e 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -1,6 +1,4 @@ -/*- - * 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 77c1ff9..d74e59e 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -1,6 +1,4 @@ -/*- - * 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 99fe51d..fbc24ec 100644 --- a/sbin/restore/restore.c +++ b/sbin/restore/restore.c @@ -1,6 +1,4 @@ -/*- - * 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 119b91e..5d02bdf 100644 --- a/sbin/restore/restore.h +++ b/sbin/restore/restore.h @@ -1,6 +1,4 @@ /*- - * 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 0a0f1e9..0713ff0 100644 --- a/sbin/restore/symtab.c +++ b/sbin/restore/symtab.c @@ -1,6 +1,4 @@ -/*- - * 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 102811f..f66f8b4 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1,6 +1,4 @@ -/*- - * 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 8582500..90bde98 100644 --- a/sbin/restore/utilities.c +++ b/sbin/restore/utilities.c @@ -1,6 +1,4 @@ -/*- - * 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 fdc245d..9a5d8e8 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,6 +1,4 @@ -/*- - * 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 088a880..a31d6f5 100644 --- a/sbin/routed/defs.h +++ b/sbin/routed/defs.h @@ -1,6 +1,4 @@ -/*- - * 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 fb5d1ac..b59186a 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -1,6 +1,4 @@ -/*- - * 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 bf49640..bdf0a8b 100644 --- a/sbin/routed/input.c +++ b/sbin/routed/input.c @@ -1,6 +1,4 @@ -/*- - * 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 81477da..4a8d3ca 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -1,6 +1,4 @@ -/*- - * 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 f62b9c8..4a9c5a2 100644 --- a/sbin/routed/output.c +++ b/sbin/routed/output.c @@ -1,6 +1,4 @@ -/*- - * 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 a6b2d74..73d7dea 100644 --- a/sbin/routed/parms.c +++ b/sbin/routed/parms.c @@ -1,6 +1,4 @@ -/*- - * 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 dd5603b..c45405e 100644 --- a/sbin/routed/pathnames.h +++ b/sbin/routed/pathnames.h @@ -1,6 +1,4 @@ -/*- - * 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 58982cc..9ae0876 100644 --- a/sbin/routed/radix.c +++ b/sbin/routed/radix.c @@ -1,6 +1,4 @@ -/*- - * 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 d7deda7..5cc177e 100644 --- a/sbin/routed/radix.h +++ b/sbin/routed/radix.h @@ -1,6 +1,4 @@ -/*- - * 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 56edebb..959b80f 100644 --- a/sbin/routed/rdisc.c +++ b/sbin/routed/rdisc.c @@ -1,6 +1,4 @@ -/*- - * 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 7a1b5d9..2d9f351 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -1,6 +1,4 @@ /*- - * 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 c45b8af..7804d7c 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -1,6 +1,4 @@ -/*- - * 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 4c21318..fefa3a3 100644 --- a/sbin/routed/trace.c +++ b/sbin/routed/trace.c @@ -1,6 +1,4 @@ -/*- - * 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 2ff67c8..4c3f945 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -1,6 +1,4 @@ /*- - * 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 ae0859c..f336c5d 100644 --- a/sbin/setkey/parse.y +++ b/sbin/setkey/parse.y @@ -1,9 +1,7 @@ /* $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 1d66a92..e4525ee 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -1,9 +1,7 @@ /* $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 aead9d8..d3af162 100644 --- a/sbin/setkey/test-pfkey.c +++ b/sbin/setkey/test-pfkey.c @@ -1,9 +1,7 @@ /* $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 3bf5c897..9749dd3 100644 --- a/sbin/setkey/test-policy.c +++ b/sbin/setkey/test-policy.c @@ -1,6 +1,4 @@ -/*- - * 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 358f87a..7f30859 100644 --- a/sbin/setkey/token.l +++ b/sbin/setkey/token.l @@ -1,9 +1,7 @@ /* $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 c7e96cb..f3251c7 100644 --- a/sbin/setkey/vchar.h +++ b/sbin/setkey/vchar.h @@ -1,9 +1,7 @@ /* $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 f4fa1d0..b04e0bd 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -1,6 +1,4 @@ -/*- - * 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 d1d5cea..c79e213 100644 --- a/sbin/sunlabel/sunlabel.c +++ b/sbin/sunlabel/sunlabel.c @@ -24,9 +24,7 @@ * 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 746ad48..6ec2ff1 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -1,6 +1,4 @@ /*- - * 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 ce65abf..0f56174 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,6 +1,4 @@ -/*- - * 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 e30bdd5..b03cdde7 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -1,6 +1,4 @@ -/*- - * 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 378156c..adda048 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause - * * Copyright (c) 1980, 1989, 1993 * The Regents of the University of California. All rights reserved. * |
