diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-11 14:46:39 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-11 16:25:36 -0700 |
commit | cdb028377e1e2f266401a4c1184ba95749f71d96 (patch) | |
tree | dd88e7e97b6a6d390437d7a1b8ee98a2e3459caa /src | |
parent | bd23db4c51f8d6836e6f1cf10f47000ba7f752e8 (diff) | |
download | consfigurator-cdb028377e1e2f266401a4c1184ba95749f71d96.tar.gz |
rename CAPABILITY-P -> POSIX-CAPABILITY-P
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src')
-rw-r--r-- | src/package.lisp | 2 | ||||
-rw-r--r-- | src/util/linux-namespace.lisp | 2 | ||||
-rw-r--r-- | src/util/posix1e.lisp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/package.lisp b/src/package.lisp index c5a4b9a..cd57b51 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -411,7 +411,7 @@ #:+CAP-BPF+ #:+CAP-CHECKPOINT-RESTORE+ - #:capability-p)) + #:posix-capability-p)) (package :consfigurator.util.linux-namespace (:use #:consfigurator.util.posix1e #:cffi) diff --git a/src/util/linux-namespace.lisp b/src/util/linux-namespace.lisp index 38d4c11..606f311 100644 --- a/src/util/linux-namespace.lisp +++ b/src/util/linux-namespace.lisp @@ -153,7 +153,7 @@ CONSFIGURATOR.UTIL.LINUX-NAMESPACE:REDUCE-ID-MAPS and user_namespaces(7)." (defun setgroups-p () "In a Lisp-type connection, do we have the ability to use setgroups(2)?" (and #-linux (zerop (nix:geteuid)) - #+linux (capability-p :cap-effective +CAP-SETGID+) + #+linux (posix-capability-p :cap-effective +CAP-SETGID+) #+linux (string= "allow" (stripln (read-file-string "/proc/thread-self/setgroups"))))) diff --git a/src/util/posix1e.lisp b/src/util/posix1e.lisp index e1ebc8d..270ecdf 100644 --- a/src/util/posix1e.lisp +++ b/src/util/posix1e.lisp @@ -76,7 +76,7 @@ "cap_get_flag" :int (cap-p :pointer) (cap cap_value_t) (flag cap_flag_t) (value-p :pointer)) -(defun capability-p (set &rest capabilities) +(defun posix-capability-p (set &rest capabilities) "Does the current thread have each of CAPABILITIES in SET?" (let ((cap-opaque (cap-get-proc))) (unwind-protect |