[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.1.0-9-gca33ea9

X2Go dev team git-admin at x2go.org
Mon Apr 15 23:53:17 CEST 2013


The branch, master has been updated
       via  ca33ea93056615c370586d9f1054b29695b56393 (commit)
      from  6089879c268eaafb9cd3bdc76dc9f06346ef592f (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 ca33ea93056615c370586d9f1054b29695b56393
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 15 23:52:04 2013 +0200

    For sessions profiles with autologin enable, add a dummy key session profile parameter that triggers key based auth in X2Go Client. (Fixes: #154).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9bcdecc..dad9b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.0.1.1):
     - Add WSGI support to X2Go Session Broker. Allows plugging into
       Apache2 by using the mod_wsgi module.
+    - For sessions profiles with autologin enable, add a dummy key
+      session profile parameter that triggers key based auth in X2Go Client.
+      (Fixes: #154).
   * /debian/control:
     + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
   * Properly remove the X2Go Session broker log files on package purgal.
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 89aadac..76ed8ef 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -779,6 +779,7 @@ class X2GoBroker(object):
 
             if self.use_session_autologin(profile_id):
                 profile['autologin'] = True
+                profile['key'] = 'key-comes-later'
 
             acls = self.get_profile_acls(profile_id)
 


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




More information about the x2go-commits mailing list