screen-share: Don't unset server environment variables
authorAndrew Wedgbury <andrew.wedgbury@realvnc.com>
Wed, 30 Apr 2014 08:51:19 +0000 (09:51 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 30 Apr 2014 23:54:31 +0000 (16:54 -0700)
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

index d3e3f05..6f60b81 100644 (file)
@@ -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);