From 5edbb57516835688b1a47a3e0813b3965b014db2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 22 Jul 2008 21:13:46 +0200 Subject: don't drop caps if we are started as normal root user --- src/daemon/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/daemon/main.c') diff --git a/src/daemon/main.c b/src/daemon/main.c index 14594416..553ed7d4 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -496,7 +496,7 @@ int main(int argc, char *argv[]) { if (conf->high_priority && (conf->cmd == PA_CMD_DAEMON || conf->cmd == PA_CMD_START)) pa_raise_priority(conf->nice_level); - if (pa_have_caps()) { + if (!real_root && pa_have_caps()) { pa_bool_t drop; drop = (conf->cmd != PA_CMD_DAEMON && conf->cmd != PA_CMD_START) || !conf->realtime_scheduling; -- cgit From b7b4b5e589f281c96e111ab64483893f030477e6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 30 Jul 2008 13:44:20 +0200 Subject: remove debug message --- src/daemon/main.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/daemon/main.c') diff --git a/src/daemon/main.c b/src/daemon/main.c index 553ed7d4..a8880a30 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -762,8 +762,6 @@ int main(int argc, char *argv[]) { /* If we are already running and with are run in * --start mode, then let's return this as success. */ - pa_log_info("z=%i rock!", z); - retval = 0; goto finish; } -- cgit From 0b428e7cb1efdd7330b89a9855f08c45bfa98307 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 30 Jul 2008 20:36:34 +0200 Subject: don't allow --start in system mode --- src/daemon/main.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/daemon/main.c') diff --git a/src/daemon/main.c b/src/daemon/main.c index a8880a30..5fc9f01c 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -627,6 +627,11 @@ int main(int argc, char *argv[]) { goto finish; } + if (conf->cmd == PA_CMD_START && conf->system_instance) { + pa_log("--start not supported for system instances."); + goto finish; + } + if (conf->cmd == PA_CMD_START) { /* If we shall start PA only when it is not running yet, we * first take the autospawn lock to make things -- cgit