The branch, build-baikal has been updated via 2fff2472803efca1bafb8d37731cf588adf82cdf (commit) from 77c5ce1296b305d50e72683ac31dc53a559ca743 (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: x2go/backends/proxy/base.py | 1 + x2go/backends/terminal/_stdout.py | 12 +++++++++++- x2go/forward.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 6173571..0047940 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -163,6 +163,7 @@ class X2goProxyBASE(threading.Thread): if self.fw_tunnel is None: self.logger('socket [localhost]:%s is in use, trying local TCP/IP socket port: [localhost]:%s' % (local_graphics_port, local_graphics_port+1), loglevel=log.loglevel_INFO) local_graphics_port += 1 + time.sleep(.5) # update the proxy port in PROXY_ARGS self._update_local_proxy_socket(local_graphics_port) diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 10bd484..73fe7dd 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -115,9 +115,12 @@ class X2goSessionParams(object): if cmd == 'RDP': self.session_type = 'R' return - if cmd.startswith('rdesktop'): + elif cmd.startswith('rdesktop'): self.session_type = 'R' return + elif cmd == 'XDMCP': + self.session_type = 'D' + return elif cmd in defaults.X2GO_DESKTOPSESSIONS.keys(): self.session_type = 'D' return @@ -581,6 +584,10 @@ class X2goTerminalSessionSTDOUT(object): else: cmd = self.params.cmd + if cmd == 'XDMCP': + # do not run command when in XDMCP mode... + return None + self.params.update({'cmd': cmd}) cmd_line = [ "setsid x2goruncommand", @@ -669,6 +676,9 @@ class X2goTerminalSessionSTDOUT(object): self.params.cmd, ] + if self.params.cmd == 'XDMCP' and self.params.xdmcp_server: + cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) self.session_info.initialize(stdout.read(), diff --git a/x2go/forward.py b/x2go/forward.py index 4be7e37..4e258a9 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -94,7 +94,7 @@ class X2goFwServer(StreamServer): self.logger('incoming request to %s:%d failed: %s' % (self.chain_host, self.chain_port, repr(e)), loglevel=log.loglevel_ERROR) - raise x2go_exceptions.X2goFwTunnelException('proxy tunnel setup failed') + raise x2go_exceptions.X2goFwTunnelException('forwarding tunnel setup failed') if self.chan is None: self.logger('incoming request to %s:%d was rejected by the SSH server.' % hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).