[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-18-gcf4527b
X2Go dev team
git-admin at x2go.org
Sun May 19 13:04:54 CEST 2013
The branch, build-main has been updated
via cf4527bfd7d98fc9c46339c61d1239522f9cbdf9 (commit)
from 762de5b6b9eea0241adbb7c72495368c16d32605 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2gobroker/agent.py | 4 ++--
x2gobroker/brokers/base_broker.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 0c5873a..4ca299c 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -176,7 +176,7 @@ def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/aut
if query_mode.upper() == u'LOCAL':
return call_local_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ])
else:
- return call_local_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent)
+ return call_remote_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent)
def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/authorized_keys', query_mode='LOCAL', remote_agent=None):
"""\
@@ -197,7 +197,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/
if query_mode.upper() == u'LOCAL':
return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ])
else:
- return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent)
+ return call_remote_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent)
def get_servers(username, query_mode='LOCAL', remote_agent=None):
"""\
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index c980119..10cda40 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -849,10 +849,11 @@ class X2GoBroker(object):
# session auto-start feature
if self.use_session_autostart(profile_id):
- pubkey, privkey = x2gobroker.agent.genkeypair()
+ pubkey, privkey = x2gobroker.agent.genkeypair(username=username, client_address=self.get_client_address())
x2gobroker.agent.add_authorized_key(username=username,
pubkey_hash=pubkey,
authorized_keys_file=self.get_authorized_keys_file(profile_id),
+ query_mode=agent_query_mode,
remote_agent=remote_agent,
),
selected_session.update({
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