summaryrefslogtreecommitdiffstats
path: root/src/daemon/caps.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-03-31 22:12:32 +0000
committerLennart Poettering <lennart@poettering.net>2008-03-31 22:12:32 +0000
commit1af0d948d1f241b0d01cedf074979409ee609adb (patch)
tree3726ca85f1e0bc4c7abbfbc343f25e53542dfd17 /src/daemon/caps.c
parent9f71611ab0880994f8f23234084d1e10b17b314a (diff)
merge r2193 from prepare-0.9.10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2208 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/caps.c')
-rw-r--r--src/daemon/caps.c25
1 files changed, 6 insertions, 19 deletions
diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 44ee355e..af593388 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -90,8 +90,8 @@ int pa_limit_caps(void) {
cap_t caps;
cap_value_t nice_cap = CAP_SYS_NICE;
- caps = cap_init();
- pa_assert(caps);
+ pa_assert_se(caps = cap_init());
+
cap_clear(caps);
cap_set_flag(caps, CAP_EFFECTIVE, 1, &nice_cap, CAP_SET);
cap_set_flag(caps, CAP_PERMITTED, 1, &nice_cap, CAP_SET);
@@ -113,28 +113,15 @@ fail:
}
/* Drop all capabilities, effectively becoming a normal user */
-int pa_drop_caps(void) {
+void pa_drop_caps(void) {
cap_t caps;
- int r = -1;
- caps = cap_init();
- pa_assert(caps);
+ pa_assert_se(prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) == 0);
+ pa_assert_se(caps = cap_init());
cap_clear(caps);
-
- prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
-
- if (cap_set_proc(caps) < 0) {
- pa_log("Failed to drop capabilities: %s", pa_cstrerror(errno));
- goto fail;
- }
-
- r = 0;
-
-fail:
+ pa_assert_se(cap_set_proc(caps) == 0);
cap_free(caps);
-
- return r;
}
#else