The branch, master has been updated via e388fd69d4fd75c8e417eee4ffdc6dd2bb1169de (commit) from 185d624e21315ba72cfafac8fa31ac84b8e759b0 (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 e388fd69d4fd75c8e417eee4ffdc6dd2bb1169de Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Mar 2 00:17:49 2013 +0100 omitting from= in authorized_keys file ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 3075d44..1b19170 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -248,7 +248,10 @@ def genkeypair(local_username, client_address, key_type='RSA'): pubkey_type = 'ssh-rsa' elif key_type == "DSA": pubkey_type = 'ssh-dss' - pubkey = "from={client_address},no-X11-forwarding,no-pty,no-user-rc {pubkey_type} {pubkey} {local_username}@{client_address}".format(pubkey=key.get_base64(), pubkey_type=pubkey_type, local_username=local_username, client_address=client_address) + + # FIXME: the from option does not work properly by some reason. Fix it later + #pubkey = "from={client_address},no-X11-forwarding,no-pty,no-user-rc {pubkey_type} {pubkey} {local_username}@{client_address}".format(pubkey=key.get_base64(), pubkey_type=pubkey_type, local_username=local_username, client_address=client_address) + pubkey = "no-X11-forwarding,no-pty,no-user-rc {pubkey_type} {pubkey} {local_username}@{client_address}".format(pubkey=key.get_base64(), pubkey_type=pubkey_type, local_username=local_username, client_address=client_address) # assemble the private key privkey_obj = cStringIO.StringIO() 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).