diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-11 14:45:18 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-11 16:25:33 -0700 |
| commit | bd23db4c51f8d6836e6f1cf10f47000ba7f752e8 (patch) | |
| tree | bf7cb0c8f55083589b32768bf15eb01a13d9c504 /src/util | |
| parent | 43c3a16a239fde1648846e8f07f1e6553e859b51 (diff) | |
| download | consfigurator-bd23db4c51f8d6836e6f1cf10f47000ba7f752e8.tar.gz | |
WITH-ACL-FREE: add an extra level of list depth
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/linux-namespace.lisp | 2 | ||||
| -rw-r--r-- | src/util/posix1e.lisp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/util/linux-namespace.lisp b/src/util/linux-namespace.lisp index afa3080..38d4c11 100644 --- a/src/util/linux-namespace.lisp +++ b/src/util/linux-namespace.lisp @@ -119,7 +119,7 @@ CONSFIGURATOR.UTIL.LINUX-NAMESPACE:REDUCE-ID-MAPS and user_namespaces(7)." (when (and dirp (not linkp)) (mapc #'shift (local-directory-contents file)))))) (shift-acl (file type) - (with-acl-free (acl (acl-get-file file type)) + (with-acl-free ((acl (acl-get-file file type))) (with-foreign-objects ((uid 'uid_t) (gid 'gid_t) (entry-p 'acl_entry_t)) (loop with setp diff --git a/src/util/posix1e.lisp b/src/util/posix1e.lisp index 2166921..e1ebc8d 100644 --- a/src/util/posix1e.lisp +++ b/src/util/posix1e.lisp @@ -44,7 +44,7 @@ (%acl-get-tag-type entry-d tag-type-p) (mem-ref tag-type-p 'acl_tag_t))) -(defmacro with-acl-free ((aclvar aclcall) &body forms) +(defmacro with-acl-free (((aclvar aclcall)) &body forms) (with-gensyms (aclvar*) `(let* ((,aclvar ,aclcall) (,aclvar* (make-pointer (pointer-address ,aclvar)))) @@ -57,7 +57,7 @@ "acl_set_qualifier" :int (entry-d acl_entry_t) (qualifier-p :pointer)) (defun acl-get-qualifier (entry-d type) - (with-acl-free (qualifier-p (%acl-get-qualifier entry-d)) + (with-acl-free ((qualifier-p (%acl-get-qualifier entry-d))) (mem-ref qualifier-p type))) |