x2go-commits October 2013

x2go-commits@lists.x2go.org

2 participants
100 discussions

page changed: wiki:repositories:redhat
by wiki-admin＠x2go.org 22 Oct '13

22 Oct '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/10/22 12:53 Browser : Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36 IP-Address : 72.94.83.13 Hostname : pool-72-94-83-13.phlapa.fios.verizon.net Old Revision: http://wiki.x2go.org/doku.php/wiki:repositories:redhat?rev=1364265611 New Revision: http://wiki.x2go.org/doku.php/wiki:repositories:redhat Edit Summary: Fedora 17 no longer available on OBS (F17 is EOL) User : mikedep333 @@ -6,11 +6,11 @@ wget -O /etc/yum.repos.d/x2go.repo \ http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/X… </code> - Substitute ''RHEL_6'' by the tag for the distribution you are actually using. Available ones are: ''Fedora_17'', ''Fedora_18'', ''RHEL_5'' and ''RHEL_6''. Note that not all of X2Go is provided for RHEL 5/6, as these distributions are very old and therefore more work-intensive to develop for. + Substitute ''RHEL_6'' by the tag for the distribution you are actually using. Available ones are: ''Fedora_18'', ''RHEL_5'' and ''RHEL_6''. Note that not all of X2Go is provided for RHEL 5/6, as these distributions are very old and therefore more work-intensive to develop for. **Hint:** If you are behind a proxy, make sure the proxy is defined in ''/etc/yum.conf''. Standard yum repos do not use the same connection mechanisms as RHN channels. Congratulations, you are now able to access the X2Go packages. You may continue by installing ''x2goserver'', ''x2goclient'' or ''pyhoca-gui'' or any other of the available packages. [[doc:installation:x2goserver#rhel_6|Installation instructions for X2Go Server]] -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:sessions-file
by wiki-admin＠x2go.org 15 Oct '13

15 Oct '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/10/15 07:14 Browser : Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.69 Safari/537.36 IP-Address : 72.94.83.13 Hostname : pool-72-94-83-13.phlapa.fios.verizon.net Old Revision: http://wiki.x2go.org/doku.php/wiki:development:sessions-file?rev=1381817429 New Revision: http://wiki.x2go.org/doku.php/wiki:development:sessions-file Edit Summary: Default path name: For Windows, corrected X2GoClient non-portable path, and added PyHoca-GUI path. User : mikedep333 @@ -2,10 +2,12 @@ Default path name * Linux, Mac OS X: ''$HOME/.x2goclient/sessions'' - * Windows (non-portable mode): session profiles are stored in the Windows registry (''HKEY_LOCAL_MACHINE\SOFTWARE\x2goclient'') - * Windows (portable mode): session profiles are stored in a file (location???) + * Windows X2GoClient (non-portable mode): session profiles are stored in the Windows registry (''HKEY_CURRENT_USER\Software\Obviously Nice\x2goclient\sessions'') + * Windows X2GoClient (portable mode): session profiles are stored in a file (location???) + * Windows PyHoca-GUI: session profiles are stored in the file (''%USERPROFILE%\.x2goclient\sessions'') + Related command line options: * x2goclient: --portable, --home, --session-conf @@ -169,5 +171,4 @@ * Specify any application (by its name) that is available via $PATH. No full path names are allowed here, the path will be stripped off of the file name provided. Make sure your $PATH environment variable resolves to the wanted application properly. * Published applications mode (''command=, published=true''): * Leave the command option empty and enable the option published - -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:sessions-file
by wiki-admin＠x2go.org 15 Oct '13

15 Oct '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/10/15 06:10 Browser : Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.69 Safari/537.36 IP-Address : 72.94.83.13 Hostname : pool-72-94-83-13.phlapa.fios.verizon.net Old Revision: http://wiki.x2go.org/doku.php/wiki:development:sessions-file?rev=1363124062 New Revision: http://wiki.x2go.org/doku.php/wiki:development:sessions-file Edit Summary: [Possible Session Command Combinations] Correct several typos User : mikedep333 @@ -146,9 +146,9 @@ * Desktop sessions: (''command=[KDE,GNOME,LXDE,...]''): * KDE (startkde) * GNOME (gnome-session) - * LDXDE (lxde-session) + * LXDE (lxde-session) * XFCE4 (xfce4-session, Python X2Go only) * TRINITY (starttrinity, Python X2Go only, don't miss the [[http://code.x2go.org/gitweb?p=python-x2go.git;a=blob;f=README.Trinity-Deskt…]] file!!) * UNITY (unity-2d-launcher, Python X2Go only, very experimental and not well supported) @@ -158,17 +158,16 @@ * OFFICE (find office application on server ...) * MAILCLIENT (find mail client on server ...) * Remote Desktop (''command=RDP''): - * Setting the command to RDP will turn X2Go into an RDP proxy (RDP via NX). RDP will receive a peformance improvement on WAN connections and X2Go will guarantee SSH encryption (whereas RDP drops encryption if the bandwith won't suffice). + * Setting the command to RDP will turn X2Go into an RDP proxy (RDP via NX). RDP will receive a performance improvement on WAN connections and X2Go will guarantee SSH encryption (whereas RDP drops encryption if the bandwidth won't suffice). * Make sure to use the options rdpserver and rdpoptions properly. - * XDCMP (''command=XDCMP''): - * Do an XDCP query for the XDMCP server specified by the xdcmpserver option. Usefull if you have a complex terminal server setup behind one X2Go gateway (e.g. handled by an XDMCP chooser). + * XDMCP (''command=XDMCP''): + * Do an XDMCP query for the XDMCP server specified by the xdmcpserver option. Useful if you have a complex terminal server setup behind one X2Go gateway (e.g. handled by an XDMCP chooser). * Other applications (''command=<unix-application-on-server>''): - * Specify any application (by its name) that is avaiable via $PATH. No full path names are allowed here, the path will be stripped off of the file name provided. Make sure your $PATH environment variable resolves to the wanted application properly. + * Specify any application (by its name) that is available via $PATH. No full path names are allowed here, the path will be stripped off of the file name provided. Make sure your $PATH environment variable resolves to the wanted application properly. * Published applications mode (''command=, published=true''): * Leave the command option empty and enable the option published - -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:faq
by wiki-admin＠x2go.org 15 Oct '13

15 Oct '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/10/15 02:28 Browser : Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.69 Safari/537.36 IP-Address : 72.94.83.13 Hostname : pool-72-94-83-13.phlapa.fios.verizon.net Old Revision: http://wiki.x2go.org/doku.php/doc:faq?rev=1362749499 New Revision: http://wiki.x2go.org/doku.php/doc:faq Edit Summary: Add "On Ubuntu 12.10 & later, Unity sessions fail to start " User : mikedep333 @@ -87,5 +87,11 @@ At this time libssh, the ssh library used by x2go is unable to work with an ECDSA key. However you may use an RSA key -if you need to- or go with the ssh default authenticating method using the remote user's password. + ==== On Ubuntu 12.10 & later, Unity sessions fail to start ==== + Unfortunately, Unity on Ubuntu 12.10 will not work with X2Go in the foreseeable future. + + This is because Ubuntu 12.10 and later no longer offer Unity-2D; they only offer regular Unity. When selecting Unity in an x2go client, you are actually selecting Unity-2D. However, regular Unity requires 3D support. X2Go cannot support 3D because X2Go is currently based on the NX libraries, which do not support 3D. + + One workaround is to remain on Ubuntu 12.04 LTS, which is supported until April 2017. Another workaround is to install one of the other desktop environments that is listed in your X2Go Client. You can do so without uninstalling Unity. Follow [[http://askubuntu.com/questions/65083/what-different-desktop-environments-an… link]] for instructions on installing other desktop environments. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-23-gefcb8af
by git-admin＠x2go.org 10 Oct '13

10 Oct '13

The branch, twofactorauth has been updated via efcb8afc6c0efd744ffa60db340efdceaac196ac (commit) from a96f3876b630b7735fa0edd869801bb2f4fd8ac9 (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 efcb8afc6c0efd744ffa60db340efdceaac196ac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 10 15:59:09 2013 +0200 make incompatible paramiko versions pop up as WARNINGs ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 098f3a8..91e0a17 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -909,7 +909,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): look_for_keys=False) except TypeError: if _twofactorauth and password and passphrase and password != passphrase: - self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_NOTICE) + self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARNING) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey, key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) @@ -921,7 +921,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): look_for_keys=look_for_keys) except TypeError: if _twofactorauth and password and passphrase and password != passphrase: - self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_NOTICE) + self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARNING) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=None, key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) 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).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-12-g333ea45
by git-admin＠x2go.org 10 Oct '13

10 Oct '13

The branch, master has been updated via 333ea451e7ef5da3d610431cb0880604b6dac582 (commit) from 80a0590385f7380a2ad430cb0d19f0d451a67ec2 (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 333ea451e7ef5da3d610431cb0880604b6dac582 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 10 14:37:46 2013 +0200 Deactivate serial line terminals on X2Go thinclients. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5c10a9c..e4b367d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low Schneider for pointing at this. - Remove chroot bootstrap cruft when finished with creating the TCE chroot. + - Deactivate serial line terminals on X2Go thinclients. [ Arnold Krille ] * New upstream version (1.1.0.1): diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 37a255d..3fb8eff 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -214,6 +214,7 @@ fi [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true [ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true +[ \$? -eq 0 ] && sed -e 's/^TO:23:respawn:/#TO:23:respawn:/' -i /etc/inittab [ \$? -eq 0 ] && apt-get clean hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-11-g80a0590
by git-admin＠x2go.org 09 Oct '13

09 Oct '13

The branch, master has been updated via 80a0590385f7380a2ad430cb0d19f0d451a67ec2 (commit) from c60d59ebc3c9b5c55177d62ec6518a04a370c493 (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 80a0590385f7380a2ad430cb0d19f0d451a67ec2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 9 22:31:27 2013 +0200 Remove chroot bootstrap cruft when finished with creating the TCE chroot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../sbin/x2gothinclient_create | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b66cc83..5c10a9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low - Syntax fix in x2gousbmount script. - Make ~x2gothinclient rw-able on TCE machines. Thanks to Peter Schneider for pointing at this. + - Remove chroot bootstrap cruft when finished with creating the + TCE chroot. [ Arnold Krille ] * New upstream version (1.1.0.1): diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index bce2405..37a255d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -22,6 +22,12 @@ set -e +empty_folder() { + folder="$1" + find "$folder" -type f | while read file; do rm "$file"; done + find "$folder" -mindepth 1 -type d | sort -r | while read dir; do rmdir "$dir"; done +} + if echo $0 | egrep "^./bin/.*$" >/dev/null; then ETCDIR="etc/" SHAREDIR="share/" @@ -227,7 +233,16 @@ for mountpoint in proc dev/pts sys; do done done -rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules +empty_folder "$TC_CHROOT/tmp" +empty_folder "$TC_CHROOT/root" +empty_folder "$TC_CHROOT/etc/udev/rules.d" +empty_folder "$TC_CHROOT/var/log" +empty_folder "$TC_CHROOT/var/lib/x2gothinclient" +empty_folder "$TC_CHROOT/media" +empty_folder "$TC_CHROOT/var/lib/nfs" +empty_folder "$TC_CHROOT/var/lib/xkb" +empty_folder "$TC_CHROOT/var/lib/dbus" +empty_folder "$TC_CHROOT/var/lib/alsa" x2gothinclient_update hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-10-gc60d59e
by git-admin＠x2go.org 09 Oct '13

09 Oct '13

The branch, master has been updated via c60d59ebc3c9b5c55177d62ec6518a04a370c493 (commit) from be8300b201a43337348f261a094774c828fd0adf (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 c60d59ebc3c9b5c55177d62ec6518a04a370c493 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 9 22:17:37 2013 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: .../sbin/x2gothinclient_create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 42a868a..bce2405 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -100,7 +100,7 @@ none /tmp tmpfs size=50M,mode=1777 0 0 none /root tmpfs size=100M,mode=700 0 0 none /etc/udev/rules.d tmpfs size=50M,mode=755 0 0 none /var/log tmpfs size=50M,mode=755 0 0 -none /var/lib/x2gothinclient tmpfs size=50M,mode=700,uid=x2gothinclient,gid=x2gothincient 0 0 +none /var/lib/x2gothinclient tmpfs size=50M,mode=700,uid=x2gothinclient,gid=x2gothinclient 0 0 none /media tmpfs size=50M,mode=755 0 0 none /var/lib/nfs tmpfs size=50M,mode=755,uid=statd,gid=nogroup 0 0 none /var/lib/xkb tmpfs size=50M,mode=755 0 0 hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.1.0.0-9-gbe8300b
by git-admin＠x2go.org 09 Oct '13

09 Oct '13

The branch, master has been updated via be8300b201a43337348f261a094774c828fd0adf (commit) from 7c2b8ca6d6db7438bdfa31947460df4d198e0412 (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 be8300b201a43337348f261a094774c828fd0adf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 9 21:53:38 2013 +0200 Make ~x2gothinclient rw-able on TCE machines. Thanks to Peter Schneider for pointing at this. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../sbin/x2gothinclient_create | 24 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 12305c3..b66cc83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.1.0.1): - Switch to VT-7 on TC shutdown. - Syntax fix in x2gousbmount script. + - Make ~x2gothinclient rw-able on TCE machines. Thanks to Peter + Schneider for pointing at this. [ Arnold Krille ] * New upstream version (1.1.0.1): diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 799a592..42a868a 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -94,18 +94,18 @@ echo "x2gothinclient" > $TC_CHROOT/etc/hostname echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts cat > $TC_CHROOT/etc/fstab <<EOF -proc /proc proc defaults,noauto 0 0 -none /dev/pts devpts gid=5,mode=620,noauto 0 0 -none /tmp tmpfs size=50M,mode=1777 0 0 -none /root tmpfs size=100M,mode=700 0 0 -none /etc/udev/rules.d tmpfs size=50M 0 0 -none /var/log tmpfs size=50M 0 0 -none /var/lib/x2gothinclient tmpfs size=50M 0 0 -none /media tmpfs size=50M 0 0 -none /var/lib/nfs tmpfs size=50M 0 0 -none /var/lib/xkb tmpfs size=50M 0 0 -none /var/lib/dbus tmpfs size=50M 0 0 -none /var/lib/alsa tmpfs size=50M 0 0 +proc /proc proc defaults,noauto 0 0 +none /dev/pts devpts gid=5,mode=620,noauto 0 0 +none /tmp tmpfs size=50M,mode=1777 0 0 +none /root tmpfs size=100M,mode=700 0 0 +none /etc/udev/rules.d tmpfs size=50M,mode=755 0 0 +none /var/log tmpfs size=50M,mode=755 0 0 +none /var/lib/x2gothinclient tmpfs size=50M,mode=700,uid=x2gothinclient,gid=x2gothincient 0 0 +none /media tmpfs size=50M,mode=755 0 0 +none /var/lib/nfs tmpfs size=50M,mode=755,uid=statd,gid=nogroup 0 0 +none /var/lib/xkb tmpfs size=50M,mode=755 0 0 +none /var/lib/dbus tmpfs size=50M,mode=755 0 0 +none /var/lib/alsa tmpfs size=50M,mode=755 0 0 EOF # differences between Debian versions hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-22-ga96f387
by git-admin＠x2go.org 09 Oct '13

09 Oct '13

The branch, twofactorauth has been updated via a96f3876b630b7735fa0edd869801bb2f4fd8ac9 (commit) from 2e441444735e8fe81627e315b2d10bd09d1cad60 (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 a96f3876b630b7735fa0edd869801bb2f4fd8ac9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 9 21:02:43 2013 +0200 improvement for last commit ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index e151254..098f3a8 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -908,7 +908,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) except TypeError: - if _twofactorauth: + if _twofactorauth and password and passphrase and password != passphrase: self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_NOTICE) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey, key_filename=key_filename, timeout=timeout, allow_agent=False, @@ -920,7 +920,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) except TypeError: - if _twofactorauth: + if _twofactorauth and password and passphrase and password != passphrase: self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_NOTICE) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=None, key_filename=None, timeout=timeout, allow_agent=allow_agent, 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).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits October 2013