This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient-contrib. commit b85e7f0c2d98788e1fb0218954bf7474886f7e3d Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Apr 25 18:06:20 2015 -0400 Add cygwin 20150425-1 bundle. Changes vs cygwin 20141018-5: nxproxy 3.5.0.28 -> 3.5.0.31 (bugfix & feature update) openssh 6.6p1-3-x2go1 -> 6.8p1-1-x2go1 (upgrade) dash 0.5.8-2 -> 0.5.8-3 (feature update, not relevant to X2Go) gcc 4.8.3-3 -> 4.9.2-3 (upgrade, may improve X2Go performance) libpng15 1.5.21-2 -> libpng16 1.6.17-1 (upgrade, may improve X2Go performance) ncurses 5.9-20140524-1 -> 5.9-20150404-1 (update, probably not relevant to X2Go) zlib 1.2.8-1 -> 1.2.8-3 (update, undocumented by Cygwin project) --- cygwin/20150425-1_bin/cygXcomp.dll | Bin 0 -> 1425184 bytes cygwin/20150425-1_bin/cygcrypto-1.0.0.dll | Bin 0 -> 2028061 bytes cygwin/20150425-1_bin/cygedit-0.dll | Bin 0 -> 162845 bytes cygwin/20150425-1_bin/cyggcc_s-1.dll | Bin 0 -> 109597 bytes cygwin/20150425-1_bin/cygjpeg-8.dll | Bin 0 -> 285735 bytes cygwin/20150425-1_bin/cygncursesw-10.dll | Bin 0 -> 334365 bytes cygwin/20150425-1_bin/cygpng16-16.dll | Bin 0 -> 200221 bytes cygwin/20150425-1_bin/cygssp-0.dll | Bin 0 -> 12829 bytes cygwin/20150425-1_bin/cygstdc++-6.dll | Bin 0 -> 965149 bytes .../20150425-1_bin/cygwin files and packages.csv | 12 ++++ cygwin/20150425-1_bin/cygwin1.dll | Bin 0 -> 3339793 bytes cygwin/20150425-1_bin/cygz.dll | Bin 0 -> 84519 bytes cygwin/20150425-1_bin/nxproxy.exe | Bin 0 -> 8718 bytes cygwin/20150425-1_bin/nxproxy.exe.unstripped | Bin 0 -> 62244 bytes cygwin/20150425-1_bin/openssh build options.txt | 32 +++++++++++ cygwin/20150425-1_bin/openssh version.txt | 1 + cygwin/20150425-1_bin/sftp-server.exe | Bin 0 -> 80398 bytes cygwin/20150425-1_bin/sftp.exe | Bin 0 -> 122382 bytes cygwin/20150425-1_bin/sh.exe | Bin 0 -> 98855 bytes cygwin/20150425-1_bin/ssh-keygen.exe | Bin 0 -> 420366 bytes cygwin/20150425-1_bin/sshd.exe | Bin 0 -> 753166 bytes cygwin/20150425-1_bin_set-timestamps.sh | 21 +++++++ cygwin/20150425-1_src/cygwin-1.7.32-1-src.tar.xz | 1 + cygwin/20150425-1_src/dash-0.5.8-3-src.tar.xz | 1 + cygwin/20150425-1_src/gcc-4.9.2-3-src.tar.xz | 1 + .../20150425-1_src/libedit-20130712-1-src.tar.xz | 1 + .../libjpeg-turbo-1.3.1-3-src.tar.xz | 1 + cygwin/20150425-1_src/libpng-1.6.17-1-src.tar.xz | 1 + .../ncurses-5.9-20150404-1-src.tar.xz | 1 + cygwin/20150425-1_src/openssl-1.0.2a-1-src.tar.xz | 1 + cygwin/20150425-1_src/zlib-1.2.8-3-src.tar.xz | 1 + cygwin/src/cygwin-1.7.35-1-src.tar.xz | Bin 0 -> 10567012 bytes cygwin/src/dash-0.5.8-3-src.tar.xz | Bin 0 -> 227204 bytes cygwin/src/gcc-4.9.2-3-src.tar.xz | Bin 0 -> 89870272 bytes cygwin/src/libpng-1.6.17-1-src.tar.xz | Bin 0 -> 921512 bytes cygwin/src/ncurses-5.9-20150404-1-src.tar.xz | Bin 0 -> 3047768 bytes cygwin/src/zlib-1.2.8-3-src.tar.xz | Bin 0 -> 575168 bytes nxproxy/3.5.0.31_cygwin-20150425-1_bin | 1 + nxproxy/3.5.0.31_src/nx-libs-3.5.0.31-lite.tar.gz | Bin 0 -> 1551126 bytes openssh-server/6.8p1-1-x2go1_cygwin-20150425-1_bin | 1 + .../6.8p1-1-x2go1_src/openssh-6.8p1-1-src.tar.xz | Bin 0 -> 1476852 bytes .../6.8p1-1-x2go1_src/openssh-6.8p1-1.x2go.patch | 60 ++++++++++++++++++++ 42 files changed, 137 insertions(+) diff --git a/cygwin/20150425-1_bin/cygXcomp.dll b/cygwin/20150425-1_bin/cygXcomp.dll new file mode 100755 index 0000000..b173f20 Binary files /dev/null and b/cygwin/20150425-1_bin/cygXcomp.dll differ diff --git a/cygwin/20150425-1_bin/cygcrypto-1.0.0.dll b/cygwin/20150425-1_bin/cygcrypto-1.0.0.dll new file mode 100755 index 0000000..4d86973 Binary files /dev/null and b/cygwin/20150425-1_bin/cygcrypto-1.0.0.dll differ diff --git a/cygwin/20150425-1_bin/cygedit-0.dll b/cygwin/20150425-1_bin/cygedit-0.dll new file mode 100755 index 0000000..707bd89 Binary files /dev/null and b/cygwin/20150425-1_bin/cygedit-0.dll differ diff --git a/cygwin/20150425-1_bin/cyggcc_s-1.dll b/cygwin/20150425-1_bin/cyggcc_s-1.dll new file mode 100755 index 0000000..64de23e Binary files /dev/null and b/cygwin/20150425-1_bin/cyggcc_s-1.dll differ diff --git a/cygwin/20150425-1_bin/cygjpeg-8.dll b/cygwin/20150425-1_bin/cygjpeg-8.dll new file mode 100755 index 0000000..0c1282c Binary files /dev/null and b/cygwin/20150425-1_bin/cygjpeg-8.dll differ diff --git a/cygwin/20150425-1_bin/cygncursesw-10.dll b/cygwin/20150425-1_bin/cygncursesw-10.dll new file mode 100755 index 0000000..bf45db9 Binary files /dev/null and b/cygwin/20150425-1_bin/cygncursesw-10.dll differ diff --git a/cygwin/20150425-1_bin/cygpng16-16.dll b/cygwin/20150425-1_bin/cygpng16-16.dll new file mode 100755 index 0000000..bd19b6d Binary files /dev/null and b/cygwin/20150425-1_bin/cygpng16-16.dll differ diff --git a/cygwin/20150425-1_bin/cygssp-0.dll b/cygwin/20150425-1_bin/cygssp-0.dll new file mode 100755 index 0000000..25c1be5 Binary files /dev/null and b/cygwin/20150425-1_bin/cygssp-0.dll differ diff --git a/cygwin/20150425-1_bin/cygstdc++-6.dll b/cygwin/20150425-1_bin/cygstdc++-6.dll new file mode 100755 index 0000000..5348b7e Binary files /dev/null and b/cygwin/20150425-1_bin/cygstdc++-6.dll differ diff --git a/cygwin/20150425-1_bin/cygwin files and packages.csv b/cygwin/20150425-1_bin/cygwin files and packages.csv new file mode 100644 index 0000000..7e1545c --- /dev/null +++ b/cygwin/20150425-1_bin/cygwin files and packages.csv @@ -0,0 +1,12 @@ +File,Binary Package w/ Version,Source Package +sh.exe,dash-0.5.8-3,dash +cygwin1.dll,cygwin-1.7.35-1 +cyggcc_s-1.dll,libgcc1-4.9.2-3,gcc +cygssp-0.dll,libssp0-4.9.2-3,gcc +cygstdc++-6.dll,libstdc++6-4.9.2-3,gcc +cygedit-0.dll,libedit0-20130712-1,libedit +cygjpeg-8.dll,libjpeg8-1.3.1-3,libjpeg-turbo +cygpng16-16.dll,libpng16-1.6.17-1,libpng +cygncursesw-10.dll,libncursesw10-5.9-20150404-1,ncurses +cygcrypto-1.0.0.dll,libopenssl100-1.0.2a-1,openssl +cygz.dll,zlib0-1.2.8-3,zlib diff --git a/cygwin/20150425-1_bin/cygwin1.dll b/cygwin/20150425-1_bin/cygwin1.dll new file mode 100755 index 0000000..9a1b696 Binary files /dev/null and b/cygwin/20150425-1_bin/cygwin1.dll differ diff --git a/cygwin/20150425-1_bin/cygz.dll b/cygwin/20150425-1_bin/cygz.dll new file mode 100755 index 0000000..f992631 Binary files /dev/null and b/cygwin/20150425-1_bin/cygz.dll differ diff --git a/cygwin/20150425-1_bin/nxproxy.exe b/cygwin/20150425-1_bin/nxproxy.exe new file mode 100644 index 0000000..53bc36c Binary files /dev/null and b/cygwin/20150425-1_bin/nxproxy.exe differ diff --git a/cygwin/20150425-1_bin/nxproxy.exe.unstripped b/cygwin/20150425-1_bin/nxproxy.exe.unstripped new file mode 100755 index 0000000..43b93fc Binary files /dev/null and b/cygwin/20150425-1_bin/nxproxy.exe.unstripped differ diff --git a/cygwin/20150425-1_bin/openssh build options.txt b/cygwin/20150425-1_bin/openssh build options.txt new file mode 100644 index 0000000..9a11b55 --- /dev/null +++ b/cygwin/20150425-1_bin/openssh build options.txt @@ -0,0 +1,32 @@ +OpenSSH has been configured with the following options: + User binaries: /usr/local/bin + System binaries: /usr/local/sbin + Configuration files: /usr/local/etc + Askpass program: /usr/sbin/ssh-askpass + Manual pages: /usr/local/share/man/manX + PID file: /var/run + Privilege separation chroot path: /var/empty + sshd default user PATH: /bin:/usr/sbin:/sbin:/usr/local/bin + Manpage format: doc + PAM support: no + OSF SIA support: no + KerberosV support: no + SELinux support: no + Smartcard support: + S/KEY support: no + MD5 password support: no + libedit support: yes + Solaris process contract support: no + Solaris project support: no + IP address in $DISPLAY hack: no + Translate v4 in v6 hack: no + BSD Auth support: no + Random number source: OpenSSL internal ONLY + Privsep sandbox style: rlimit + + Host: i386-pc-mingw32 + Compiler: gcc + Compiler flags: -g -O2 -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ftrapv -fno-builtin-memset -fstack-protector-strong +Preprocessor flags: + Linker flags: -fstack-protector-strong + Libraries: -lcrypto -lz diff --git a/cygwin/20150425-1_bin/openssh version.txt b/cygwin/20150425-1_bin/openssh version.txt new file mode 100644 index 0000000..79fe87e --- /dev/null +++ b/cygwin/20150425-1_bin/openssh version.txt @@ -0,0 +1 @@ +6.8p1-1-x2go1 diff --git a/cygwin/20150425-1_bin/sftp-server.exe b/cygwin/20150425-1_bin/sftp-server.exe new file mode 100644 index 0000000..029bf87 Binary files /dev/null and b/cygwin/20150425-1_bin/sftp-server.exe differ diff --git a/cygwin/20150425-1_bin/sftp.exe b/cygwin/20150425-1_bin/sftp.exe new file mode 100644 index 0000000..bcf5918 Binary files /dev/null and b/cygwin/20150425-1_bin/sftp.exe differ diff --git a/cygwin/20150425-1_bin/sh.exe b/cygwin/20150425-1_bin/sh.exe new file mode 100755 index 0000000..a9aea03 Binary files /dev/null and b/cygwin/20150425-1_bin/sh.exe differ diff --git a/cygwin/20150425-1_bin/ssh-keygen.exe b/cygwin/20150425-1_bin/ssh-keygen.exe new file mode 100644 index 0000000..d0e2ad7 Binary files /dev/null and b/cygwin/20150425-1_bin/ssh-keygen.exe differ diff --git a/cygwin/20150425-1_bin/sshd.exe b/cygwin/20150425-1_bin/sshd.exe new file mode 100644 index 0000000..da3edcd Binary files /dev/null and b/cygwin/20150425-1_bin/sshd.exe differ diff --git a/cygwin/20150425-1_bin_set-timestamps.sh b/cygwin/20150425-1_bin_set-timestamps.sh new file mode 100755 index 0000000..1e770a4 --- /dev/null +++ b/cygwin/20150425-1_bin_set-timestamps.sh @@ -0,0 +1,21 @@ +touch --no-create -d "2015-03-19 12:34:12.000000000 -0400" "20150425-1_bin/cygcrypto-1.0.0.dll" +touch --no-create -d "2013-10-20 08:13:00.000000000 -0400" "20150425-1_bin/cygedit-0.dll" +touch --no-create -d "2015-03-03 13:04:24.000000000 -0500" "20150425-1_bin/cyggcc_s-1.dll" +touch --no-create -d "2014-12-29 20:20:43.000000000 -0500" "20150425-1_bin/cygjpeg-8.dll" +touch --no-create -d "2015-04-13 03:09:55.000000000 -0400" "20150425-1_bin/cygncursesw-10.dll" +touch --no-create -d "2015-04-13 14:47:48.000000000 -0400" "20150425-1_bin/cygpng16-16.dll" +touch --no-create -d "2015-03-03 13:07:43.000000000 -0500" "20150425-1_bin/cygssp-0.dll" +touch --no-create -d "2015-03-03 13:07:49.000000000 -0500" "20150425-1_bin/cygstdc++-6.dll" +touch --no-create -d "2015-04-25 17:05:56.511630800 -0400" "20150425-1_bin/cygwin files and packages.csv" +touch --no-create -d "2015-03-04 06:08:12.000000000 -0500" "20150425-1_bin/cygwin1.dll" +touch --no-create -d "2015-04-25 16:24:23.118155300 -0400" "20150425-1_bin/cygXcomp.dll" +touch --no-create -d "2014-11-19 17:57:33.000000000 -0500" "20150425-1_bin/cygz.dll" +touch --no-create -d "2015-04-25 16:27:36.574266000 -0400" "20150425-1_bin/nxproxy.exe" +touch --no-create -d "2015-04-25 16:26:34.069561200 -0400" "20150425-1_bin/nxproxy.exe.unstripped" +touch --no-create -d "2015-04-25 16:57:44.085388600 -0400" "20150425-1_bin/openssh build options.txt" +touch --no-create -d "2015-04-25 16:58:05.650959300 -0400" "20150425-1_bin/openssh version.txt" +touch --no-create -d "2015-04-25 16:44:12.679553000 -0400" "20150425-1_bin/sftp-server.exe" +touch --no-create -d "2015-04-25 16:44:12.660552400 -0400" "20150425-1_bin/sftp.exe" +touch --no-create -d "2014-10-27 18:12:36.000000000 -0400" "20150425-1_bin/sh.exe" +touch --no-create -d "2015-04-25 16:44:12.995786100 -0400" "20150425-1_bin/ssh-keygen.exe" +touch --no-create -d "2015-04-25 16:44:12.941735500 -0400" "20150425-1_bin/sshd.exe" diff --git a/cygwin/20150425-1_src/cygwin-1.7.32-1-src.tar.xz b/cygwin/20150425-1_src/cygwin-1.7.32-1-src.tar.xz new file mode 120000 index 0000000..d25d1f7 --- /dev/null +++ b/cygwin/20150425-1_src/cygwin-1.7.32-1-src.tar.xz @@ -0,0 +1 @@ +../src/cygwin-1.7.35-1-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/dash-0.5.8-3-src.tar.xz b/cygwin/20150425-1_src/dash-0.5.8-3-src.tar.xz new file mode 120000 index 0000000..fb352fe --- /dev/null +++ b/cygwin/20150425-1_src/dash-0.5.8-3-src.tar.xz @@ -0,0 +1 @@ +../src/dash-0.5.8-3-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/gcc-4.9.2-3-src.tar.xz b/cygwin/20150425-1_src/gcc-4.9.2-3-src.tar.xz new file mode 120000 index 0000000..df29455 --- /dev/null +++ b/cygwin/20150425-1_src/gcc-4.9.2-3-src.tar.xz @@ -0,0 +1 @@ +../src/gcc-4.9.2-3-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/libedit-20130712-1-src.tar.xz b/cygwin/20150425-1_src/libedit-20130712-1-src.tar.xz new file mode 120000 index 0000000..07fb120 --- /dev/null +++ b/cygwin/20150425-1_src/libedit-20130712-1-src.tar.xz @@ -0,0 +1 @@ +../src/libedit-20130712-1-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/libjpeg-turbo-1.3.1-3-src.tar.xz b/cygwin/20150425-1_src/libjpeg-turbo-1.3.1-3-src.tar.xz new file mode 120000 index 0000000..8eec1e9 --- /dev/null +++ b/cygwin/20150425-1_src/libjpeg-turbo-1.3.1-3-src.tar.xz @@ -0,0 +1 @@ +../src/libjpeg-turbo-1.3.1-3-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/libpng-1.6.17-1-src.tar.xz b/cygwin/20150425-1_src/libpng-1.6.17-1-src.tar.xz new file mode 120000 index 0000000..d7dda5b --- /dev/null +++ b/cygwin/20150425-1_src/libpng-1.6.17-1-src.tar.xz @@ -0,0 +1 @@ +../src/libpng-1.6.17-1-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/ncurses-5.9-20150404-1-src.tar.xz b/cygwin/20150425-1_src/ncurses-5.9-20150404-1-src.tar.xz new file mode 120000 index 0000000..22c842f --- /dev/null +++ b/cygwin/20150425-1_src/ncurses-5.9-20150404-1-src.tar.xz @@ -0,0 +1 @@ +../src/ncurses-5.9-20150404-1-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/openssl-1.0.2a-1-src.tar.xz b/cygwin/20150425-1_src/openssl-1.0.2a-1-src.tar.xz new file mode 120000 index 0000000..62c4c05 --- /dev/null +++ b/cygwin/20150425-1_src/openssl-1.0.2a-1-src.tar.xz @@ -0,0 +1 @@ +../src/openssl-1.0.2a-1-src.tar.xz \ No newline at end of file diff --git a/cygwin/20150425-1_src/zlib-1.2.8-3-src.tar.xz b/cygwin/20150425-1_src/zlib-1.2.8-3-src.tar.xz new file mode 120000 index 0000000..b14d70d --- /dev/null +++ b/cygwin/20150425-1_src/zlib-1.2.8-3-src.tar.xz @@ -0,0 +1 @@ +../src/zlib-1.2.8-3-src.tar.xz \ No newline at end of file diff --git a/cygwin/src/cygwin-1.7.35-1-src.tar.xz b/cygwin/src/cygwin-1.7.35-1-src.tar.xz new file mode 100644 index 0000000..520ed50 Binary files /dev/null and b/cygwin/src/cygwin-1.7.35-1-src.tar.xz differ diff --git a/cygwin/src/dash-0.5.8-3-src.tar.xz b/cygwin/src/dash-0.5.8-3-src.tar.xz new file mode 100644 index 0000000..6ad8c35 Binary files /dev/null and b/cygwin/src/dash-0.5.8-3-src.tar.xz differ diff --git a/cygwin/src/gcc-4.9.2-3-src.tar.xz b/cygwin/src/gcc-4.9.2-3-src.tar.xz new file mode 100644 index 0000000..eed7495 Binary files /dev/null and b/cygwin/src/gcc-4.9.2-3-src.tar.xz differ diff --git a/cygwin/src/libpng-1.6.17-1-src.tar.xz b/cygwin/src/libpng-1.6.17-1-src.tar.xz new file mode 100644 index 0000000..8c71ab5 Binary files /dev/null and b/cygwin/src/libpng-1.6.17-1-src.tar.xz differ diff --git a/cygwin/src/ncurses-5.9-20150404-1-src.tar.xz b/cygwin/src/ncurses-5.9-20150404-1-src.tar.xz new file mode 100644 index 0000000..e4f28b1 Binary files /dev/null and b/cygwin/src/ncurses-5.9-20150404-1-src.tar.xz differ diff --git a/cygwin/src/zlib-1.2.8-3-src.tar.xz b/cygwin/src/zlib-1.2.8-3-src.tar.xz new file mode 100644 index 0000000..b214a62 Binary files /dev/null and b/cygwin/src/zlib-1.2.8-3-src.tar.xz differ diff --git a/nxproxy/3.5.0.31_cygwin-20150425-1_bin b/nxproxy/3.5.0.31_cygwin-20150425-1_bin new file mode 120000 index 0000000..4a120ed --- /dev/null +++ b/nxproxy/3.5.0.31_cygwin-20150425-1_bin @@ -0,0 +1 @@ +../cygwin/20150425-1_bin \ No newline at end of file diff --git a/nxproxy/3.5.0.31_src/nx-libs-3.5.0.31-lite.tar.gz b/nxproxy/3.5.0.31_src/nx-libs-3.5.0.31-lite.tar.gz new file mode 100644 index 0000000..57dbe80 Binary files /dev/null and b/nxproxy/3.5.0.31_src/nx-libs-3.5.0.31-lite.tar.gz differ diff --git a/openssh-server/6.8p1-1-x2go1_cygwin-20150425-1_bin b/openssh-server/6.8p1-1-x2go1_cygwin-20150425-1_bin new file mode 120000 index 0000000..4a120ed --- /dev/null +++ b/openssh-server/6.8p1-1-x2go1_cygwin-20150425-1_bin @@ -0,0 +1 @@ +../cygwin/20150425-1_bin \ No newline at end of file diff --git a/openssh-server/6.8p1-1-x2go1_src/openssh-6.8p1-1-src.tar.xz b/openssh-server/6.8p1-1-x2go1_src/openssh-6.8p1-1-src.tar.xz new file mode 100644 index 0000000..8a71bdd Binary files /dev/null and b/openssh-server/6.8p1-1-x2go1_src/openssh-6.8p1-1-src.tar.xz differ diff --git a/openssh-server/6.8p1-1-x2go1_src/openssh-6.8p1-1.x2go.patch b/openssh-server/6.8p1-1-x2go1_src/openssh-6.8p1-1.x2go.patch new file mode 100644 index 0000000..c555633 --- /dev/null +++ b/openssh-server/6.8p1-1-x2go1_src/openssh-6.8p1-1.x2go.patch @@ -0,0 +1,60 @@ +diff --git a/auth.c.orig b/auth.c +index f9b7673..0141871 100644 +--- a/auth.c.orig ++++ b/auth.c +@@ -164,19 +164,33 @@ allowed_user(struct passwd * pw) + char *shell = xstrdup((pw->pw_shell[0] == '\0') ? + _PATH_BSHELL : pw->pw_shell); /* empty = /bin/sh */ + ++ /* Workaround for X2Go Client ++ * Path to shell is specified in sshd_config file ++ * as "subsystem shell" ++ */ ++ int i; ++ for(i=0; i<options.num_subsystems;++i) ++ if(!strcmp("shell", options.subsystem_name[i])) { ++ free(shell); ++ shell=xstrdup(options.subsystem_command[i]); ++ } ++ + if (stat(shell, &st) != 0) { + logit("User %.100s not allowed because shell %.100s " + "does not exist", pw->pw_name, shell); + free(shell); + return 0; + } ++ ++ /* Do not check shell attributes */ ++ /* + if (S_ISREG(st.st_mode) == 0 || + (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { + logit("User %.100s not allowed because shell %.100s " + "is not executable", pw->pw_name, shell); + free(shell); + return 0; +- } ++ }*/ + free(shell); + } + +diff --git a/session.c.orig b/session.c +index 54bac36..bd6df0a 100644 +--- a/session.c.orig ++++ b/session.c +@@ -1739,6 +1739,16 @@ do_child(Session *s, const char *command) + shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); + #endif + ++ ++ /* Workaround for X2Go Client ++ * Path to shell is specified in sshd_config file ++ * as "subsystem shell" ++ */ ++ int i; ++ for(i=0; i<options.num_subsystems;++i) ++ if(!strcmp("shell", options.subsystem_name[i])) ++ shell=options.subsystem_command[i]; ++ + /* we have to stash the hostname before we close our socket. */ + if (options.use_login) + hostname = get_remote_name_or_ip(utmp_len, -- Alioth's /srv/git/code.x2go.org/x2goclient-contrib.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient-contrib.git