[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.2-4-geb38dff

[X2Go dev team]

The branch, master has been updated
       via  eb38dffa485257cdd3d74af7bbff1ce1aa7eaf3d (commit)
      from  e1c9f59fd8e23d0ac0e9fa7926058df415858ca8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eb38dffa485257cdd3d74af7bbff1ce1aa7eaf3d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 4 13:21:18 2013 +0200

    Handle the rootless property automatically for know-by-name desktop sessions.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2gobroker/brokers/base_broker.py |    4 ++++
 x2gobroker/defaults.py            |   13 +++++++++++++
 3 files changed, 19 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1e42d52..180b5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low
       »<hostname> (<address>)« in host= session profile field. (Fixes: #218).
     - Add rootless=false to example session profiles for all Desktop sessions in
       x2gobroker-sessionprofiles.conf.
+    - Handle the rootless property automatically for know-by-name desktop
+      sessions.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 May 2013 17:42:12 +0200
 
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index bb1656b..def2d50 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -799,6 +799,10 @@ class X2GoBroker(object):
                 profile['autologin'] = True
                 profile['key'] = 'key-comes-later'
 
+            # make sure that desktop sessions (that we know by name) do run with rootless=false
+            if profile['command'] in x2gobroker.defaults.X2GO_DESKTOP_SESSIONS:
+                profile['rootless'] = false
+
             acls = self.get_profile_acls(profile_id)
 
             if self.check_profile_acls(username, acls):
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 65b84b4..3ce7269 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -159,6 +159,19 @@ X2GOBROKER_CONFIG_DEFAULTS = {
     },
 }
 
+X2GO_DESKTOP_SESSIONS= [
+    'KDE',
+    'GNOME',
+    'XFCE',
+    'CINNAMON',
+    'MATE',
+    'XFCE',
+    'LXDE',
+    'TRINITY',
+    'UNITY',
+    'XDMCP',
+]
+
 # defaults for X2Go Sessino Broker session profiles file
 X2GOBROKER_SESSIONPROFILE_DEFAULTS = {
     u'DEFAULT': {


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).