Commit 79a8efb4 authored by Carlos Garnacho's avatar Carlos Garnacho Committed by Tanu Kaskinen
Browse files

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

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.
parent b80b19e0
......@@ -43,6 +43,14 @@ int pa_client_conf_from_x11(pa_client_conf *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")))
goto finish;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment