On 09/27/2016 08:39 AM, Laurent Bigonville wrote:
> From: Laurent Bigonville <[email protected]>
> 
> According to dbus upstream: "dbus-launch is fairly horrible code,
> complicated by the historical need for it to support X11 autolaunching,
> so the D-Bus maintainers would like to move it out of the critical path
> and minimize its use."
> 
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836289
> 
> Signed-off-by: Laurent Bigonville <[email protected]>

Thanks, applied.

> ---
>  policycoreutils/sandbox/sandbox | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/policycoreutils/sandbox/sandbox b/policycoreutils/sandbox/sandbox
> index b6bc805..4010e83 100644
> --- a/policycoreutils/sandbox/sandbox
> +++ b/policycoreutils/sandbox/sandbox
> @@ -285,9 +285,13 @@ class Sandbox:
>  # /usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
>  %s &
>  WM_PID=$!
> -dbus-launch --exit-with-session %s
> +if which dbus-run-session >/dev/null 2>&1; then
> +    dbus-run-session -- %s
> +else
> +    dbus-launch --exit-with-session %s
> +fi
>  kill -TERM $WM_PID  2> /dev/null
> -""" % (command, wm, command))
> +""" % (command, wm, command, command))
>          fd.close()
>          os.chmod(execfile, 0o700)
>  
> 

_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].

Reply via email to