17 files changed, 39 insertions, 5 deletions

diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index b57a784dc5e7..ddc8eec0fad3 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Simple authentication database handling code.
  *
  * Copyright (c) 1998
diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c
index 24bcc39a35e9..77db2266f5e2 100644
--- a/lib/libutil/expand_number.c
+++ b/lib/libutil/expand_number.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Eric Anderson <anderson@FreeBSD.org>
  * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c
index bb5d99629a3e..485eee4c1109 100644
--- a/lib/libutil/flopen.c
+++ b/lib/libutil/flopen.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index d03357eae95c..436ec2018653 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,6 +1,8 @@
 /*	$NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/libutil/gr_util.c b/lib/libutil/gr_util.c
index fcc08209e0cc..796cbf021ded 100644
--- a/lib/libutil/gr_util.c
+++ b/lib/libutil/gr_util.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Sean C. Farley <scf@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 675a969aaa1e..5e8fe3dfd188 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -1,6 +1,8 @@
 /*	$NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
  * Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
  * All rights reserved.
diff --git a/lib/libutil/kinfo_getallproc.c b/lib/libutil/kinfo_getallproc.c
index 8620f48545dc..609d77a259ac 100644
--- a/lib/libutil/kinfo_getallproc.c
+++ b/lib/libutil/kinfo_getallproc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Robert N. M. Watson
  * Copyright (c) 2009 Ulf Lilleengen
  * All rights reserved.
diff --git a/lib/libutil/kinfo_getproc.c b/lib/libutil/kinfo_getproc.c
index 496f71f55559..4d16b1c16a13 100644
--- a/lib/libutil/kinfo_getproc.c
+++ b/lib/libutil/kinfo_getproc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Ulf Lilleengen
  * All rights reserved.
  *
diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c
index b4a6ab6d6fbf..970ee50e2936 100644
--- a/lib/libutil/kld.c
+++ b/lib/libutil/kld.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index fa924dbd28be..c79eaac5a5fa 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
  * All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index c65fc9b8328a..b5ab10e6be85 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Brian Fundakowski Feldman
  * All rights reserved.
  *
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index f5777f62b079..b0ce2f30d2d1 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index a944f9d2fb23..f65a970e685b 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  *
  * Simple property list handling code.
  *
diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c
index 27444c2e31a5..2172a5b8e430 100644
--- a/lib/libutil/quotafile.c
+++ b/lib/libutil/quotafile.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008 Marshall Kirk McKusick
  * All rights reserved.
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 87ac1dda85cb..31dd1a50445c 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
  * All rights reserved.
  *
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index ec78a3503609..55d6e0c45fba 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Brian Fundakowski Feldman
  * All rights reserved.
  *
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index 85c27e0a1c10..a783070bcd8c 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
  *   Based on original work by Atsushi Murai <amurai@FreeBSD.org>
  * All rights reserved.