From bc51ad6afd5464d3b91b66e1c488a1fa7b4dc04c Mon Sep 17 00:00:00 2001
From: Andrew Wedgbury <andrew.wedgbury@realvnc.com>
Date: Wed, 30 Apr 2014 09:51:19 +0100
Subject: [PATCH] screen-share: Don't unset server environment variables
There is no need to unset WAYLAND_DISPLAY and WAYLAND_SOCKET when screen-share
launches the fullscreen shell server. This was done originally in case the
launched server decided to use the wayland backend based on the presence of
these. However, we pass a command line argument telling it to use the RDP
backend, which overrides the automatic backend selection based on the
environment.
Keeping these environment variables allows the launched fullscreen shell server
to know the original server's display name, which it may need in order to show
a configuration UI.
Signed-off-by: Andrew Wedgbury <andrew.wedgbury@realvnc.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---
src/screen-share.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/screen-share.c b/src/screen-share.c
index d3e3f05a3..6f60b81cf 100644
--- a/src/screen-share.c
+++ b/src/screen-share.c
@@ -1005,10 +1005,6 @@ weston_output_share(struct weston_output *output,
}
if (pid == 0) {
- /* We don't want anything circular */
- unsetenv("WAYLAND_DISPLAY");
- unsetenv("WAYLAND_SOCKET");
-
/* do not give our signal mask to the new process */
sigfillset(&allsigs);
sigprocmask(SIG_UNBLOCK, &allsigs, NULL);
--
GitLab