diff --git a/server/src/uds/transports/X2GO/TX2GOTransport.py b/server/src/uds/transports/X2GO/TX2GOTransport.py index e13dd52b5..59381d028 100644 --- a/server/src/uds/transports/X2GO/TX2GOTransport.py +++ b/server/src/uds/transports/X2GO/TX2GOTransport.py @@ -45,7 +45,7 @@ import logging import random import string -__updated__ = '2017-12-20' +__updated__ = '2018-03-14' logger = logging.getLogger(__name__) @@ -93,6 +93,7 @@ class TX2GOTransport(BaseX2GOTransport): desktop = self.desktopType.value if desktop == "UDSVAPP": desktop = "/usr/bin/udsvapp " + self.customCmd.value + rootless = True xf = x2gofile.getTemplate( speed=self.speed.value, @@ -102,6 +103,7 @@ class TX2GOTransport(BaseX2GOTransport): soundSystem=self.sound.value, windowManager=desktop, exports=self.exports.isTrue(), + rootless=rootless, width=width, height=height, user=username diff --git a/server/src/uds/transports/X2GO/X2GOTransport.py b/server/src/uds/transports/X2GO/X2GOTransport.py index a07839770..d5acf384b 100644 --- a/server/src/uds/transports/X2GO/X2GOTransport.py +++ b/server/src/uds/transports/X2GO/X2GOTransport.py @@ -40,7 +40,7 @@ from . import x2gofile import logging -__updated__ = '2017-12-20' +__updated__ = '2018-03-14' logger = logging.getLogger(__name__) @@ -79,6 +79,7 @@ class X2GOTransport(BaseX2GOTransport): desktop = self.desktopType.value if desktop == "UDSVAPP": desktop = "/usr/bin/udsvapp " + self.customCmd.value + rootless = True xf = x2gofile.getTemplate( speed=self.speed.value, @@ -88,6 +89,7 @@ class X2GOTransport(BaseX2GOTransport): soundSystem=self.sound.value, windowManager=desktop, exports=self.exports.isTrue(), + rootless=rootless, width=width, height=height, user=username diff --git a/server/src/uds/transports/X2GO/x2gofile.py b/server/src/uds/transports/X2GO/x2gofile.py index 4a1e76dcc..972921106 100644 --- a/server/src/uds/transports/X2GO/x2gofile.py +++ b/server/src/uds/transports/X2GO/x2gofile.py @@ -75,7 +75,7 @@ autologin=false krblogin=false krbdelegation=false directrdp=false -rootless=false +rootless={rootless} published=false applications=WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL command={windowManager} @@ -94,7 +94,8 @@ sshproxyautologin=false sshproxykrblogin=false ''' -def getTemplate(speed, pack, quality, sound, soundSystem, windowManager, exports, width, height, user): + +def getTemplate(speed, pack, quality, sound, soundSystem, windowManager, exports, rootless, width, height, user): trueFalse = lambda(x): 'true' if x else 'false' export = 'export="{export}"' if exports else '' if width == -1 or height == -1: @@ -111,6 +112,7 @@ def getTemplate(speed, pack, quality, sound, soundSystem, windowManager, exports soundSystem=soundSystem, windowManager=windowManager, export=export, + rootless=rootless and 'true' or 'false', width=width, height=height, fullscreen=fullscreen,