aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew G. Morgan <morgan@kernel.org>2022-10-19 19:04:50 -0700
committerAndrew G. Morgan <morgan@kernel.org>2022-10-19 19:05:11 -0700
commit70998415a87587f31063a26a1e52c6f7806b7834 (patch)
tree49a5afe9a61524893959ae5970ee656cda25902e
parent10041371f4175ec175e841c48100c7567d42eba5 (diff)
downloadlibcap-70998415a87587f31063a26a1e52c6f7806b7834.tar.gz
Reviewed license information and adde SPDX ids.
Günther Noack reported some issues with automated dependency checking in https://bugzilla.kernel.org/show_bug.cgi?id=216609 Perhaps these additional lines will help assist those things. I did find a typo in pam_cap/execable.c so I've fixed that. Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
-rw-r--r--License2
-rw-r--r--cap/License2
-rw-r--r--pam_cap/License2
-rw-r--r--pam_cap/execable.c2
-rw-r--r--psx/License2
5 files changed, 9 insertions, 1 deletions
diff --git a/License b/License
index 43a1297..2398977 100644
--- a/License
+++ b/License
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */
+
Unless otherwise *explicitly* stated, the following text describes the
licensed conditions under which the contents of this libcap release
may be used and distributed.
diff --git a/cap/License b/cap/License
index a0ec04e..095f754 100644
--- a/cap/License
+++ b/cap/License
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */
+
Unless otherwise *explicitly* stated, the following text describes the
licensed conditions under which the contents of this libcap/cap release
may be used and distributed.
diff --git a/pam_cap/License b/pam_cap/License
index e88aa3f..6c20dc0 100644
--- a/pam_cap/License
+++ b/pam_cap/License
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause OR LGPL-2.0-or-later */
+
Unless otherwise *explicitly* stated the following text describes the
licensed conditions under which the contents of this module release
may be distributed:
diff --git a/pam_cap/execable.c b/pam_cap/execable.c
index f826a57..17276b4 100644
--- a/pam_cap/execable.c
+++ b/pam_cap/execable.c
@@ -26,7 +26,7 @@ SO_MAIN(int argc, char **argv)
printf(
"%s (version " LIBCAP_VERSION ") is a PAM module to specify\n"
"inheritable (IAB) capabilities via the libpam authentication\n"
- "abstraction. See the libcap License file for licensing information.\n"
+ "abstraction. See the pam_cap License file for licensing information.\n"
"\n"
"Release notes and feature documentation for libcap and pam_cap.so\n"
"can be found at:\n"
diff --git a/psx/License b/psx/License
index 2645a87..39108c2 100644
--- a/psx/License
+++ b/psx/License
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */
+
Unless otherwise *explicitly* stated, the following text describes the
licensed conditions under which the contents of this libcap/psx release
may be used and distributed.