x2gobroker.git - statusflag (branch) updated: 0.0.2.2-26-g0c8c841 - x2go-commits

4 Jun 2013

The branch, statusflag has been updated
       via  0c8c8412912d6f0918d296d98cc4f1872db1b79b (commit)
      from  8282f90fcc078cb80d4679da5bfffc6569e70f25 (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 0c8c8412912d6f0918d296d98cc4f1872db1b79b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Jun 5 00:58:40 2013 +0200

    don't show the value of the host session parameter in list_profiles()

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

Summary of changes:
 lib/x2gobroker-agent.pl           |    4 ++--
 x2gobroker/brokers/base_broker.py |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index fab9942..7c80ae4 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -187,7 +187,7 @@ if($mode eq 'suspendsession')
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
 	my $sid=shift;
-	exec ("/bin/su - $uid -c \"$(x2gopath lib)/x2gochangestatus S $sid\"");
+	exec ("/bin/su - $uid -c \"\$(x2gopath lib)/x2gochangestatus S $sid\"");
 }
 
 if($mode eq 'terminatesession')
@@ -195,7 +195,7 @@ if($mode eq 'terminatesession')
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
 	my $sid=shift;
-	exec ("/bin/su - $uid -c \"$(x2gopath lib)/x2gochangestatus T $sid\"");
+	exec ("/bin/su - $uid -c \"\$(x2gopath lib)/x2gochangestatus T $sid\"");
 }
 
 if($mode eq 'ping')
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index db1ffb3..fd0e9a4 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -839,6 +839,12 @@ class X2GoBroker(object):
         for profile_id in self.get_profile_ids():
             profile = self.get_profile(profile_id)
 
+            for key in profile.keys():
+                if key.startswith('host'):
+                    del profile[key]
+
+            profile['host'] = []
+
             if self.use_session_autologin(profile_id):
                 profile['autologin'] = True
                 profile['key'] = 'key-comes-later'


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).

    