Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 1cb5647f76dc8cd7bacbce2a64fac9e6c2dc3b16 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> |
| 3 | Date: Tue, 28 Apr 2015 14:32:43 +0300 |
| 4 | Subject: [PATCH] client-conf: Add allow-autospawn-for-root |
| 5 | |
| 6 | Usually autospawning for root is a bad idea, since it can easily |
| 7 | interfere with other users' PulseAudio instances, but in embedded |
| 8 | environments where only root exists, autospawning is fine. |
| 9 | |
| 10 | Upstream-Status: Submitted [http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/23549] |
| 11 | |
| 12 | Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> |
| 13 | --- |
| 14 | man/pulse-client.conf.5.xml.in | 9 +++++++++ |
| 15 | src/pulse/client-conf.c | 1 + |
| 16 | src/pulse/client-conf.h | 1 + |
| 17 | src/pulse/client.conf.in | 1 + |
| 18 | src/pulse/context.c | 2 +- |
| 19 | 5 files changed, 13 insertions(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in |
| 22 | index 1002dbe..0058490 100644 |
| 23 | --- a/man/pulse-client.conf.5.xml.in |
| 24 | +++ b/man/pulse-client.conf.5.xml.in |
| 25 | @@ -71,6 +71,15 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. |
| 26 | </option> |
| 27 | |
| 28 | <option> |
| 29 | + <p><opt>allow-autospawn-for-root=</opt> Allow autospawning also for root. |
| 30 | + Takes a boolean value, defaults to <opt>no</opt>. If the <opt>autospawn |
| 31 | + </opt> option is disabled, this option has no effect. Autospawning for |
| 32 | + root is disabled by default, because running PulseAudio as root will |
| 33 | + interfere with regular users' PulseAudio instances. This option should be |
| 34 | + enabled only in environments where there are no regular users at all.</p> |
| 35 | + </option> |
| 36 | + |
| 37 | + <option> |
| 38 | <p><opt>daemon-binary=</opt> Path to the PulseAudio daemon to |
| 39 | run when autospawning. Defaults to a path configured at compile |
| 40 | time.</p> |
| 41 | diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c |
| 42 | index 83331f8..0474583 100644 |
| 43 | --- a/src/pulse/client-conf.c |
| 44 | +++ b/src/pulse/client-conf.c |
| 45 | @@ -138,6 +138,7 @@ void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_e |
| 46 | { "default-server", pa_config_parse_string, &c->default_server, NULL }, |
| 47 | { "default-dbus-server", pa_config_parse_string, &c->default_dbus_server, NULL }, |
| 48 | { "autospawn", pa_config_parse_bool, &c->autospawn, NULL }, |
| 49 | + { "allow-autospawn-for-root", pa_config_parse_bool, &c->allow_autospawn_for_root, NULL }, |
| 50 | { "cookie-file", pa_config_parse_string, &c->cookie_file_from_client_conf, NULL }, |
| 51 | { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, |
| 52 | { "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL }, |
| 53 | diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h |
| 54 | index eac705a..131393a 100644 |
| 55 | --- a/src/pulse/client-conf.h |
| 56 | +++ b/src/pulse/client-conf.h |
| 57 | @@ -38,6 +38,7 @@ typedef struct pa_client_conf { |
| 58 | char *cookie_file_from_application; |
| 59 | char *cookie_file_from_client_conf; |
| 60 | bool autospawn, disable_shm, auto_connect_localhost, auto_connect_display; |
| 61 | + bool allow_autospawn_for_root; |
| 62 | size_t shm_size; |
| 63 | } pa_client_conf; |
| 64 | |
| 65 | diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in |
| 66 | index 26b7790..69830ef 100644 |
| 67 | --- a/src/pulse/client.conf.in |
| 68 | +++ b/src/pulse/client.conf.in |
| 69 | @@ -23,6 +23,7 @@ |
| 70 | ; default-dbus-server = |
| 71 | |
| 72 | ; autospawn = yes |
| 73 | +; allow-autospawn-for-root = no |
| 74 | ; daemon-binary = @PA_BINARY@ |
| 75 | ; extra-arguments = --log-target=syslog |
| 76 | |
| 77 | diff --git a/src/pulse/context.c b/src/pulse/context.c |
| 78 | index 4bc445f..d6c3f6d 100644 |
| 79 | --- a/src/pulse/context.c |
| 80 | +++ b/src/pulse/context.c |
| 81 | @@ -976,7 +976,7 @@ int pa_context_connect( |
| 82 | if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) { |
| 83 | |
| 84 | #ifdef HAVE_GETUID |
| 85 | - if (getuid() == 0) |
| 86 | + if (!c->conf->allow_autospawn_for_root && getuid() == 0) |
| 87 | pa_log_debug("Not doing autospawn since we are root."); |
| 88 | else { |
| 89 | c->do_autospawn = true; |
| 90 | -- |
| 91 | 1.9.3 |
| 92 | |