about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-07-20 13:25:04 -0400
committerJune McEnroe <june@causal.agency>2021-07-20 13:25:04 -0400
commitd9388fa2a8672831075fa0e48dff35033347a4af (patch)
tree1302f35626f05ec1792abe59c5ba011e5eb7ad1d
parentDon't apply uiThreshold to Network and Debug (diff)
downloadcatgirl-d9388fa2a8672831075fa0e48dff35033347a4af.tar.gz
catgirl-d9388fa2a8672831075fa0e48dff35033347a4af.zip
FreeBSD: Revert caph_enter(3) call to cap_enter(2)
caph_enter(3) is the same as cap_enter(2) except that it returns
success even if the kernel does not support capability mode. Since
we only enter capability mode when explicitly requested by the
restrict option, it should fail loudly if it is not supported. On
the other hand, we make calls to caph_rights_limit(3) and friends
in some places regardless of whether we actually enter capability
mode (to keep the code simple), so those should continue to succeed
even if capability mode is not supported.
-rw-r--r--chat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/chat.c b/chat.c
index 3141052..f5004e7 100644
--- a/chat.c
+++ b/chat.c
@@ -201,8 +201,8 @@ static void sandboxLate(int irc) {
 	caph_cache_tzdata();
 	gmtime(&(time_t) { time(NULL) });
 
-	error = caph_enter();
-	if (error) err(EX_OSERR, "caph_enter");
+	error = cap_enter();
+	if (error) err(EX_OSERR, "cap_enter");
 }
 
 #else