Skip to content

Commit

Permalink
Auto merge of #3022 - asomers:capsicum, r=JohnTitor
Browse files Browse the repository at this point in the history
Add more capsicum functions for FreeBSD

These have all been available since at least FreeBSD 9.2.
  • Loading branch information
bors committed Nov 30, 2022
2 parents b8c8e13 + afb665d commit d6fe782
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
17 changes: 17 additions & 0 deletions libc-test/semver/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,23 @@ bpf_program
bpf_stat
bpf_version
bsearch
cap_enter
cap_getmode
cap_fcntls_get
cap_fcntls_limit
cap_ioctls_get
cap_ioctls_limit
__cap_rights_init
__cap_rights_get
__cap_rights_set
__cap_rights_clear
__cap_rights_is_set
cap_rights_is_valid
cap_rights_limit
cap_rights_merge
cap_rights_remove
cap_rights_contains
cap_sandboxed
cfmakesane
chflags
chflagsat
Expand Down
6 changes: 6 additions & 0 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4292,8 +4292,13 @@ extern "C" {
pub fn cpuset_setid(which: cpuwhich_t, id: ::id_t, setid: ::cpusetid_t) -> ::c_int;
pub fn cap_enter() -> ::c_int;
pub fn cap_getmode(modep: *mut ::c_uint) -> ::c_int;
pub fn cap_fcntls_get(fd: ::c_int, fcntlrightsp: *mut u32) -> ::c_int;
pub fn cap_fcntls_limit(fd: ::c_int, fcntlrights: u32) -> ::c_int;
pub fn cap_ioctls_get(fd: ::c_int, cmds: *mut u_long, maxcmds: usize) -> isize;
pub fn cap_ioctls_limit(fd: ::c_int, cmds: *const u_long, ncmds: usize) -> ::c_int;
pub fn __cap_rights_init(version: ::c_int, rights: *mut cap_rights_t, ...)
-> *mut cap_rights_t;
pub fn __cap_rights_get(version: ::c_int, fd: ::c_int, rightsp: *mut cap_rights_t) -> ::c_int;
pub fn __cap_rights_set(rights: *mut cap_rights_t, ...) -> *mut cap_rights_t;
pub fn __cap_rights_clear(rights: *mut cap_rights_t, ...) -> *mut cap_rights_t;
pub fn __cap_rights_is_set(rights: *const cap_rights_t, ...) -> bool;
Expand All @@ -4303,6 +4308,7 @@ extern "C" {
pub fn cap_rights_remove(dst: *mut cap_rights_t, src: *const cap_rights_t)
-> *mut cap_rights_t;
pub fn cap_rights_contains(big: *const cap_rights_t, little: *const cap_rights_t) -> bool;
pub fn cap_sandboxed() -> bool;

pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;

Expand Down

0 comments on commit d6fe782

Please sign in to comment.