users(1): Use capsicum helpers for users
In doing so also fix the libcasper.h header to work in C++.
This commit is contained in:
parent
e513711c99
commit
b75bfde83d
@ -105,7 +105,7 @@ cap_init(void)
|
||||
{
|
||||
cap_channel_t *chan;
|
||||
|
||||
chan = malloc(sizeof(*chan));
|
||||
chan = (cap_channel_t *)malloc(sizeof(*chan));
|
||||
if (chan != NULL) {
|
||||
chan->cch_fd = -1;
|
||||
}
|
||||
|
@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/capsicum.h>
|
||||
|
||||
#include <capsicum_helpers.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <utmpx.h>
|
||||
@ -56,7 +57,7 @@ main(int argc, char **)
|
||||
|
||||
setutxent();
|
||||
|
||||
if (cap_enter() < 0 && errno != ENOSYS)
|
||||
if (caph_enter())
|
||||
err(1, "Failed to enter capability mode.");
|
||||
|
||||
while ((ut = getutxent()) != NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user