60 files changed, 4 insertions, 124 deletions

diff --git a/lib/libgssapi/context.h b/lib/libgssapi/context.h
index dcb08df2a3a8..ac162aa1d6ac 100644
--- a/lib/libgssapi/context.h
+++ b/lib/libgssapi/context.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/cred.h b/lib/libgssapi/cred.h
index 3e6e9f25339b..e6fed6f88b93 100644
--- a/lib/libgssapi/cred.h
+++ b/lib/libgssapi/cred.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_accept_sec_context.c b/lib/libgssapi/gss_accept_sec_context.c
index 2cab71ee3dfd..0fa739c96a9e 100644
--- a/lib/libgssapi/gss_accept_sec_context.c
+++ b/lib/libgssapi/gss_accept_sec_context.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_acquire_cred.c b/lib/libgssapi/gss_acquire_cred.c
index 5c04a97c28ee..f6ae4d1f700c 100644
--- a/lib/libgssapi/gss_acquire_cred.c
+++ b/lib/libgssapi/gss_acquire_cred.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_add_cred.c b/lib/libgssapi/gss_add_cred.c
index a8955b200d00..34e29b1a2b71 100644
--- a/lib/libgssapi/gss_add_cred.c
+++ b/lib/libgssapi/gss_add_cred.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_add_oid_set_member.c b/lib/libgssapi/gss_add_oid_set_member.c
index 2c926c483926..57d3499cbd1f 100644
--- a/lib/libgssapi/gss_add_oid_set_member.c
+++ b/lib/libgssapi/gss_add_oid_set_member.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_buffer_set.c b/lib/libgssapi/gss_buffer_set.c
index fa084573f1b1..100dd4d58d4d 100644
--- a/lib/libgssapi/gss_buffer_set.c
+++ b/lib/libgssapi/gss_buffer_set.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 2004, PADL Software Pty Ltd.
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_canonicalize_name.c b/lib/libgssapi/gss_canonicalize_name.c
index 1967555a4e60..28940b9dbbba 100644
--- a/lib/libgssapi/gss_canonicalize_name.c
+++ b/lib/libgssapi/gss_canonicalize_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_compare_name.c b/lib/libgssapi/gss_compare_name.c
index 327a6a728744..05b28f600ac6 100644
--- a/lib/libgssapi/gss_compare_name.c
+++ b/lib/libgssapi/gss_compare_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_context_time.c b/lib/libgssapi/gss_context_time.c
index 86f04696733c..585ebd690875 100644
--- a/lib/libgssapi/gss_context_time.c
+++ b/lib/libgssapi/gss_context_time.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_create_empty_oid_set.c b/lib/libgssapi/gss_create_empty_oid_set.c
index e7d1f77c91d2..c35f99f3120d 100644
--- a/lib/libgssapi/gss_create_empty_oid_set.c
+++ b/lib/libgssapi/gss_create_empty_oid_set.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_decapsulate_token.c b/lib/libgssapi/gss_decapsulate_token.c
index d48a854f9267..65ff46ab3c1a 100644
--- a/lib/libgssapi/gss_decapsulate_token.c
+++ b/lib/libgssapi/gss_decapsulate_token.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_delete_sec_context.c
index 151147010c12..b4b087f93142 100644
--- a/lib/libgssapi/gss_delete_sec_context.c
+++ b/lib/libgssapi/gss_delete_sec_context.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_display_name.c b/lib/libgssapi/gss_display_name.c
index 907ab0f22504..61faabac907e 100644
--- a/lib/libgssapi/gss_display_name.c
+++ b/lib/libgssapi/gss_display_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_display_status.c b/lib/libgssapi/gss_display_status.c
index b8ff12c4c3cb..b2a22d21fb48 100644
--- a/lib/libgssapi/gss_display_status.c
+++ b/lib/libgssapi/gss_display_status.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_duplicate_name.c b/lib/libgssapi/gss_duplicate_name.c
index 02aa2ccf6f8b..c6d07ac4e2b4 100644
--- a/lib/libgssapi/gss_duplicate_name.c
+++ b/lib/libgssapi/gss_duplicate_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_duplicate_oid.c b/lib/libgssapi/gss_duplicate_oid.c
index c61dedd6cb77..591508d8fa58 100644
--- a/lib/libgssapi/gss_duplicate_oid.c
+++ b/lib/libgssapi/gss_duplicate_oid.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_encapsulate_token.c b/lib/libgssapi/gss_encapsulate_token.c
index e7ab7f84ff7a..0e33e191ec85 100644
--- a/lib/libgssapi/gss_encapsulate_token.c
+++ b/lib/libgssapi/gss_encapsulate_token.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_export_name.c b/lib/libgssapi/gss_export_name.c
index 5b7c32955539..49174bbcafd0 100644
--- a/lib/libgssapi/gss_export_name.c
+++ b/lib/libgssapi/gss_export_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_export_sec_context.c b/lib/libgssapi/gss_export_sec_context.c
index c94e81a9a844..a600f280048f 100644
--- a/lib/libgssapi/gss_export_sec_context.c
+++ b/lib/libgssapi/gss_export_sec_context.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_get_mic.c b/lib/libgssapi/gss_get_mic.c
index e8b4e52a0df3..b55a796dedad 100644
--- a/lib/libgssapi/gss_get_mic.c
+++ b/lib/libgssapi/gss_get_mic.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_import_name.c b/lib/libgssapi/gss_import_name.c
index efc02d5f3028..3d8079d2dea9 100644
--- a/lib/libgssapi/gss_import_name.c
+++ b/lib/libgssapi/gss_import_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_import_sec_context.c b/lib/libgssapi/gss_import_sec_context.c
index f3c59b0e877b..0ab138ecae98 100644
--- a/lib/libgssapi/gss_import_sec_context.c
+++ b/lib/libgssapi/gss_import_sec_context.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_indicate_mechs.c b/lib/libgssapi/gss_indicate_mechs.c
index aab3ff4e32ce..ec4350f8eeb1 100644
--- a/lib/libgssapi/gss_indicate_mechs.c
+++ b/lib/libgssapi/gss_indicate_mechs.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_init_sec_context.c b/lib/libgssapi/gss_init_sec_context.c
index 04a1e3eab3d2..d8f06ab3e819 100644
--- a/lib/libgssapi/gss_init_sec_context.c
+++ b/lib/libgssapi/gss_init_sec_context.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_context.c b/lib/libgssapi/gss_inquire_context.c
index 207e1c357e9c..59e03e819284 100644
--- a/lib/libgssapi/gss_inquire_context.c
+++ b/lib/libgssapi/gss_inquire_context.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_cred.c b/lib/libgssapi/gss_inquire_cred.c
index 60984371558a..c51f07e55841 100644
--- a/lib/libgssapi/gss_inquire_cred.c
+++ b/lib/libgssapi/gss_inquire_cred.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_cred_by_mech.c b/lib/libgssapi/gss_inquire_cred_by_mech.c
index b8394fa3e94d..d9c21bac2156 100644
--- a/lib/libgssapi/gss_inquire_cred_by_mech.c
+++ b/lib/libgssapi/gss_inquire_cred_by_mech.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_cred_by_oid.c b/lib/libgssapi/gss_inquire_cred_by_oid.c
index f564f3636338..fcb54a1d95bd 100644
--- a/lib/libgssapi/gss_inquire_cred_by_oid.c
+++ b/lib/libgssapi/gss_inquire_cred_by_oid.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 2004, PADL Software Pty Ltd.
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_mechs_for_name.c b/lib/libgssapi/gss_inquire_mechs_for_name.c
index d171ef2b5bd8..68918df7fd54 100644
--- a/lib/libgssapi/gss_inquire_mechs_for_name.c
+++ b/lib/libgssapi/gss_inquire_mechs_for_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_names_for_mech.c b/lib/libgssapi/gss_inquire_names_for_mech.c
index 4d683075290c..21f03afb648b 100644
--- a/lib/libgssapi/gss_inquire_names_for_mech.c
+++ b/lib/libgssapi/gss_inquire_names_for_mech.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_inquire_sec_context_by_oid.c b/lib/libgssapi/gss_inquire_sec_context_by_oid.c
index b4a4670b60be..5a9014210d1b 100644
--- a/lib/libgssapi/gss_inquire_sec_context_by_oid.c
+++ b/lib/libgssapi/gss_inquire_sec_context_by_oid.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_krb5.c b/lib/libgssapi/gss_krb5.c
index 36b6f3556632..5150f8564a04 100644
--- a/lib/libgssapi/gss_krb5.c
+++ b/lib/libgssapi/gss_krb5.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_mech_switch.c b/lib/libgssapi/gss_mech_switch.c
index 4ef6e50182ca..2d742e7ee232 100644
--- a/lib/libgssapi/gss_mech_switch.c
+++ b/lib/libgssapi/gss_mech_switch.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_names.c b/lib/libgssapi/gss_names.c
index 663a686d551b..02775ec72db3 100644
--- a/lib/libgssapi/gss_names.c
+++ b/lib/libgssapi/gss_names.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_oid_to_str.c b/lib/libgssapi/gss_oid_to_str.c
index 836b149676d8..05e0d73887d8 100644
--- a/lib/libgssapi/gss_oid_to_str.c
+++ b/lib/libgssapi/gss_oid_to_str.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2000 The Regents of the University of Michigan.
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_pname_to_uid.c b/lib/libgssapi/gss_pname_to_uid.c
index 9ee23a17c345..eb560b9e4248 100644
--- a/lib/libgssapi/gss_pname_to_uid.c
+++ b/lib/libgssapi/gss_pname_to_uid.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson <dfr@rabson.org>
  * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
diff --git a/lib/libgssapi/gss_process_context_token.c b/lib/libgssapi/gss_process_context_token.c
index 2a91ece95d26..0b4d7ec9bfca 100644
--- a/lib/libgssapi/gss_process_context_token.c
+++ b/lib/libgssapi/gss_process_context_token.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_pseudo_random.c b/lib/libgssapi/gss_pseudo_random.c
index 423da4f57e08..c74682329585 100644
--- a/lib/libgssapi/gss_pseudo_random.c
+++ b/lib/libgssapi/gss_pseudo_random.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
diff --git a/lib/libgssapi/gss_release_buffer.c b/lib/libgssapi/gss_release_buffer.c
index 8a32d8db4530..7a85745abc5b 100644
--- a/lib/libgssapi/gss_release_buffer.c
+++ b/lib/libgssapi/gss_release_buffer.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_release_cred.c b/lib/libgssapi/gss_release_cred.c
index abcb6d18a7a9..6093acd8f3b7 100644
--- a/lib/libgssapi/gss_release_cred.c
+++ b/lib/libgssapi/gss_release_cred.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_release_name.c b/lib/libgssapi/gss_release_name.c
index 56fcf26b4a51..08ae10a26ec3 100644
--- a/lib/libgssapi/gss_release_name.c
+++ b/lib/libgssapi/gss_release_name.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_release_oid.c b/lib/libgssapi/gss_release_oid.c
index 19e3b262456c..01d06937f13e 100644
--- a/lib/libgssapi/gss_release_oid.c
+++ b/lib/libgssapi/gss_release_oid.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
diff --git a/lib/libgssapi/gss_release_oid_set.c b/lib/libgssapi/gss_release_oid_set.c
index 6a5a1577f85f..a46853a4a0d8 100644
--- a/lib/libgssapi/gss_release_oid_set.c
+++ b/lib/libgssapi/gss_release_oid_set.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_seal.c b/lib/libgssapi/gss_seal.c
index 9d0e25c52220..c3e3f7a83d66 100644
--- a/lib/libgssapi/gss_seal.c
+++ b/lib/libgssapi/gss_seal.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_set_cred_option.c b/lib/libgssapi/gss_set_cred_option.c
index e645e7799d1e..93b221294651 100644
--- a/lib/libgssapi/gss_set_cred_option.c
+++ b/lib/libgssapi/gss_set_cred_option.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 2004, PADL Software Pty Ltd.
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_set_sec_context_option.c b/lib/libgssapi/gss_set_sec_context_option.c
index cda908d7ded8..4b6bf1bda269 100644
--- a/lib/libgssapi/gss_set_sec_context_option.c
+++ b/lib/libgssapi/gss_set_sec_context_option.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 2004, PADL Software Pty Ltd.
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_sign.c b/lib/libgssapi/gss_sign.c
index e8ebf3784c77..c521a7e533e6 100644
--- a/lib/libgssapi/gss_sign.c
+++ b/lib/libgssapi/gss_sign.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_test_oid_set_member.c b/lib/libgssapi/gss_test_oid_set_member.c
index dde6c7a66ad1..0421319eb149 100644
--- a/lib/libgssapi/gss_test_oid_set_member.c
+++ b/lib/libgssapi/gss_test_oid_set_member.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_unseal.c b/lib/libgssapi/gss_unseal.c
index 6da0ac92c5f2..c3775103ce4f 100644
--- a/lib/libgssapi/gss_unseal.c
+++ b/lib/libgssapi/gss_unseal.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_unwrap.c b/lib/libgssapi/gss_unwrap.c
index 7faf2a691d4b..9ccc848d3efe 100644
--- a/lib/libgssapi/gss_unwrap.c
+++ b/lib/libgssapi/gss_unwrap.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_utils.c b/lib/libgssapi/gss_utils.c
index ca55cc8df968..992908bea949 100644
--- a/lib/libgssapi/gss_utils.c
+++ b/lib/libgssapi/gss_utils.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_verify.c b/lib/libgssapi/gss_verify.c
index 5892d3e48259..0aa3fd67e28b 100644
--- a/lib/libgssapi/gss_verify.c
+++ b/lib/libgssapi/gss_verify.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_verify_mic.c b/lib/libgssapi/gss_verify_mic.c
index 689bf724650f..704d7fcc2c78 100644
--- a/lib/libgssapi/gss_verify_mic.c
+++ b/lib/libgssapi/gss_verify_mic.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_wrap.c b/lib/libgssapi/gss_wrap.c
index dfb6bc877d31..1cf046ab86b6 100644
--- a/lib/libgssapi/gss_wrap.c
+++ b/lib/libgssapi/gss_wrap.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/gss_wrap_size_limit.c b/lib/libgssapi/gss_wrap_size_limit.c
index 30d422c52fe9..7038a576e7c2 100644
--- a/lib/libgssapi/gss_wrap_size_limit.c
+++ b/lib/libgssapi/gss_wrap_size_limit.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/mech_switch.h b/lib/libgssapi/mech_switch.h
index 4018f9e22a7c..e5173df4002e 100644
--- a/lib/libgssapi/mech_switch.h
+++ b/lib/libgssapi/mech_switch.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/name.h b/lib/libgssapi/name.h
index 8702fd88df67..7f54359dc003 100644
--- a/lib/libgssapi/name.h
+++ b/lib/libgssapi/name.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/spnego.h b/lib/libgssapi/spnego.h
index 2fa3a6024ad2..8b2e22d537f2 100644
--- a/lib/libgssapi/spnego.h
+++ b/lib/libgssapi/spnego.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *
diff --git a/lib/libgssapi/utils.h b/lib/libgssapi/utils.h
index fb0bd72f7eae..347b58358f3a 100644
--- a/lib/libgssapi/utils.h
+++ b/lib/libgssapi/utils.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
  *