mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-conf: Avoid loading X11 properties unless SSH_CONNECTION is set

Browse source 
Reading properties from the X11 root window is meant to provide 1:1 results
with reading the configuration directly in the local case. This configuration
is essentially different only in remote cases.

Add an extra check for the SSH_CONNECTION envvar, so we don't even need
opening a X11 display connection for IPC in the most usual case.
This commit is contained in:
Carlos Garnacho 2019-06-22 14:33:59 +02:00 • committed by Tanu Kaskinen
parent b80b19e060
commit 79a8efb45c
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pulse/client-conf-x11.c
View file

@ -43,6 +43,14 @@ int pa_client_conf_from_x11(pa_client_conf *c) {
pa_assert(c); pa_assert(c);
/* Local connections will have configuration and X root window
* properties match 1:1, these paths are only strictly necessary
* for remote clients, so check for SSH_CONNECTION to make sure
* this is a remote session with X forwarding.
*/
if (!getenv("SSH_CONNECTION"))
goto finish;
if (!(dname = getenv("DISPLAY"))) if (!(dname = getenv("DISPLAY")))
goto finish; goto finish;