daemon: unconditionally clean up priviliges

This commit is contained in:
Lennart Poettering 2009-08-12 21:35:48 +02:00
parent facae1f275
commit 9f53aa5546

View file

@ -58,11 +58,8 @@ void pa_drop_root(void) {
#ifdef HAVE_GETUID #ifdef HAVE_GETUID
uid_t uid; uid_t uid;
pa_log_debug(_("Cleaning up privileges."));
uid = getuid(); uid = getuid();
if (uid == 0 || geteuid() != 0)
return;
pa_log_info(_("Dropping root privileges."));
#if defined(HAVE_SETRESUID) #if defined(HAVE_SETRESUID)
pa_assert_se(setresuid(uid, uid, uid) >= 0); pa_assert_se(setresuid(uid, uid, uid) >= 0);
@ -82,7 +79,7 @@ void pa_drop_root(void) {
#endif #endif
#ifdef HAVE_SYS_CAPABILITY_H #ifdef HAVE_SYS_CAPABILITY_H
{ if (uid != 0) {
cap_t caps; cap_t caps;
pa_assert_se(caps = cap_init()); pa_assert_se(caps = cap_init());
pa_assert_se(cap_clear(caps) == 0); pa_assert_se(cap_clear(caps) == 0);