From unknown Thu Apr 30 00:21:09 2026 MIME-Version: 1.0 X-Mailer: MIME-tools 5.502 (Entity 5.502) X-Loop: owner@bugs.x2go.org From: owner@bugs.x2go.org (X2Go Bug Tracking System) Subject: Bug#798 closed by X2Go Release Manager (X2Go issue (in src:x2goclient) has been marked as closed) Message-ID: References: <20150527064817.DA5F95DA8C@ymir.das-netzwerkteam.de> X-X2go-PR-Keywords: pending X-X2go-PR-Message: they-closed 798 X-X2go-PR-Package: x2goplugin X-X2go-PR-Source: x2goclient Date: Wed, 27 May 2015 06:50:27 +0000 Content-Type: multipart/mixed; boundary="----------=_1432709427-6011-0" This is a multi-part message in MIME format... ------------=_1432709427-6011-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 This is an automatic notification regarding your Bug report which was filed against the x2goplugin package: #798: X2Go Plugin does not honor SSH proxy settings It has been closed by X2Go Release Manager . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact X2Go Release Manager <= git-admin@x2go.org> by replying to this email. --=20 X2Go Bug Tracking System Contact owner@bugs.x2go.org with problems ------------=_1432709427-6011-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at control) by bugs.x2go.org; 27 May 2015 06:49:01 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_RELAYS, URIBL_BLOCKED autolearn=ham version=3.3.2 Received: by ymir.das-netzwerkteam.de (Postfix, from userid 1005) id DA5F95DA8C; Wed, 27 May 2015 08:48:17 +0200 (CEST) From: X2Go Release Manager To: 798-submitter@bugs.x2go.org Cc: control@bugs.x2go.org, 798@bugs.x2go.org Subject: X2Go issue (in src:x2goclient) has been marked as closed Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Message-Id: <20150527064817.DA5F95DA8C@ymir.das-netzwerkteam.de> Date: Wed, 27 May 2015 08:48:17 +0200 (CEST) close #798 thanks Hello, we are very hopeful that X2Go issue #798 reported by you has been resolved in the new release (4.0.4.0) of the X2Go source project »src:x2goclient«. You can view the complete changelog entry of src:x2goclient (4.0.4.0) below, and you can use the following link to view all the code changes between this and the last release of src:x2goclient. http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=827bc20093cb929729c0c996860c28bb9fe7b6a0;hp=9f92b4c68ee4cc120a13063187ef009b6aa33245 If you feel that the issue has not been resolved satisfyingly, feel free to reopen this bug report or submit a follow-up report with further observations described based on the new released version of src:x2goclient. Thanks a lot for contributing to X2Go!!! light+love X2Go Git Admin (on behalf of the sender of this mail) --- X2Go Component: src:x2goclient Version: 4.0.4.0-0x2go1 Status: RELEASE Date: Tue, 26 May 2015 21:09:14 +0200 Fixes: 389 584 625 792 793 794 797 798 804 811 827 828 830 845 851 868 869 871 Changes: x2goclient (4.0.4.0-0x2go1) RELEASED; urgency=low . [ Mike DePaulo ] * New upstream release (4.0.4.0): - Windows: Do not delete saved PuTTY sessions when Kerberos 5 (GSSAPI) authentication is enabled (Fixes: #625/#789) - Windows: Fix "Connection failed" "pscp" error with folder sharing when Kerberos 5 (GSSAPI) auth is used, and the server-side home dir is at a path other than /home/$USER (Fixes: #868) - Windows: Fix audio (PulseAudio) when Kerberos 5 (GSSAPI) authentication is used (Fixes: #869) - Windows: Include debug build in the regular installer. It is an optional component during the install. It is not installed by default. - Windows: Include Pageant and PuTTYgen in the installer. They are optional components during the install. They are installed by default. - Windows: Add descriptions for the "components" in the installer (English language only at this time) - Windows: You can now view the version and some other info by: right-click on the installer -> Properties -> Details (English language only at this time) - Windows: Upgrade bundled PulseAudio from 5.0-rev18 to 6.0-11.1 (No known impacts to X2Go, except for the fact that many needed patches are now included in upstream PulseAudio.) - Windows: Upgrade bundled VcXsrv from 1.15.2.2-xp+vc2013+x2go1 to 1.17.0.0-1 (X2Go/Arctica Build) Note that X2Go Client for Windows 4.0.3.2-20150508 has an update to 1.15.2.6 (X2Go/Arctica), which fixes all the CVEs. The differences relevant to X2Go are: + Numerous X.org components were upgraded to new major/minor versions. + CVE-2015-0255 was fixed in VcXsrv itself + CVE-2015-3418 was fixed in VcXsrv itself + Font files no longer differ in each build due to timestamp differences + VcXsrv's bundled version of openssl was upgraded from 1.0.1k to 1.0.2a (fixes the multiple CVEs announced on 2015-03-19) + VcXsrv's bundled version of libXfont was upgraded from 1.4.8 to 1.5.1 (Fixes CVE-2015-1802 through CVE-2015-1804) + VcXsrv's bundled version of freetype was updated from 2.5.3 to 2.5.5 (fixes CVE-2014-9656 through CVE-2014-9675) - Windows: Update bundled Win32 OpenSSL from 1.0.1L to 1.0.1m, which fixes the multiple CVEs announced on 2015-03-19. Note that X2Go Client for Windows 4.0.3.2-20150329 has this update also. - Windows: Update bundled PuTTY from 0.63 to 0.64. In addition to other changes, CVE-2015-2157 has been fixed. - Windows: Upgrade libssh from 0.6.4 to 0.7.0 (while maintaining Pageant support). The differences relevant to X2Go are: + CVE-2015-3146 was fixed + Added support for ed25519 keys + Added SHA2 algorithms for HMAC Note that X2Go Client for Windows 4.0.3.2-20150508 has the update to 0.6.5, which fixes the CVE also. - Windows: Update bundled nxproxy (nx-libs-lite) from 3.5.0.27 to 3.5.0.31. (bugfix & feature update) - Windows: Update/Upgrade bundled Cygwin components to latest versions as of 2015-04-25 (except for the Cygwin DLL, which was upgraded but not to the latest version). Note that all the security fixes were included in updates to X2Go Client for Windows 4.0.3.2 + openssl 1.0.1k-1 -> 1.0.2a-1 (upgrade. includes security fixes for the multiple CVEs announced on 2015-03-19.) + libjpeg-turbo 1.8.1-1 -> 1.8.1-3 (security update for CVE-2014-9092) + libpng 1.5.21-2 -> libpng16 1.6.17-1 (upgrade, may improve X2Go performance when PNG compression is selected. Also includes the fix for CVE-2013-6954) + gcc 4.8.3-3 -> 4.9.2-3 (upgrade, may improve X2Go performance a little bit) + openssh 6.6p1-3-x2go1 -> 6.8p1-1-x2go1 (upgrade, probably not relevant to X2Go) + cygwin (DLL) 1.7.32-1 -> 1.7.33-1 (upgrade, probably not relevant to X2Go) + dash 0.5.8-2 -> 0.5.8-3 (feature update, not relevant to X2Go) + 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) - Windows: Copy the exact version of each cygwin DLL from the cygwin binary tarballs rather than copying the "rebased" version from an X2Go developer's cygwin installation. What effect this will have on users is TBD. However, it does mean that we are distributing the exact DLLs that the Cygwin project provides, which is desirable for security. . [ Mihai Moldovan ] * New upstream version (4.0.4.0): - Move *.cpp and *.h files to src/ and *.ts files to src/i18n/. - Reference src/ in Doxyfile. - Reference src/ and src/i18n/ in x2goclient.pro. - Move *.ui files to src/ui/ and reference in x2goclient.pro. - Translate and simplify header in x2goclient.pro. - Add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. - Move resource files to src/res/ and reference in x2goclient.pro. - Reference changes in shipped Makefile. - Rename SRC_DIR to TOP_DIR in shipped Makefile. - Rename qtbrowserplugin--opensource to x2gobrowserplugin- and reference in x2goclient.pro. - Move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro. - Remove executability from x2goclient.pro. - Fix typos and update URL's in INSTALL file. - Fix typos and grammar in HOWTO.GPGCARD. - Add "X2Go Project" copyright to LICENSE file. - Replace backticks with $() and change spaces to tabs in Makefile.man2html. - Reformat README.OpenSSL-Exception. - Grammar fix in README.i18n. - Update .gitignore with more temporary files. - Make x2goclient.pro consistent: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable. - Move *.rc and *.rcc files back to top directory for now. Resources must be in the resource file's base directory or a sub-directory. - Move icons/ to img/icons/ and update references in + resources.rcc + COPYRIGHT.x2go-logos + Makefile + debian/x2goclient.install + macbuild.sh + nsis/x2goclient.nsi + src/onmainwindow.cpp + src/appdialog.cpp + src/folderbutton.cpp + src/folderexplorer.cpp + src/sessionbutton.cpp + src/sessionexplorer.cpp + src/sessionmanagedialog.cpp + src/sessionwidget.cpp + src/ui/helpdialog.ui + src/xsettingswidget.cpp - Move png/ to img/png/ and update references in resources.rcc and src/onmainwindow.cpp. - Move svg/ to img/svg/ and update references in resources.rcc, src/folderbutton.cpp, src/onmainwindow.cpp and src/sessionbutton.cpp. - Move *.ts files back to the top directory (they are resources.) - Move *.ts and *.qm files to i18n/ and update references in resources.rcc, x2goclient.pro and debian/rules. - Fix formatting errors in nsis/gpl.txt. - Fix whitespace errors in nsis/x2goclient.nsi. - Don't change the icons path in nsis/x2goclient.nsi. - Make nsis files non-executable. - Move x2go-logos/ to img/x2go-logos and update references in COPYRIGHT.x2go-logos. - Fix whitespace errors in x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc. - Move i18n/ to res/i18n/ and update references in debian/rules and x2goclient.pro. - Remove executability bit from src/sshmasterconnection.cpp and src/sshprocess.cpp. - Move img/ to res/img/ and update references in + COPYRIGHT.x2go-logos + Makefile + debian/x2goclient.install + macbuild.sh + x2goclient.pro + x2goclient.rc - Move + git.rcc + changelog.rcc + x2goclient.rc + resources.rcc to res/ and update references in x2goclient.pro and src/ui/helpdialog.ui. - Reference new src directory as include dir in x2goclient.pro. - Move txt/ to res/text/ and update references in + x2goclient.pro + Makefile + debian/rules + x2goclient.spec - Whitespace fix in Info.plist. - Use more quoting and curly braces for referencing variables in macbuild.sh. - Define TOP_DIR variable in macbuild.sh -- set to $PWD. - Define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET in macbuild.sh which can also be (pre-)set through the environment. Default to the 10.7 SDK and deployment target. Use the variables when calling qmake. - Specify -spec macx-g++ when using qmake in macbuild.sh. - Directly reference project file for qmake in macbuild.sh. - Use out-of-source build and do not overwrite the default shipped Makefile in macbuild.sh. - Also also specify the top dir when defining the path to the generated appbundle and dmg file in macbuild.sh. - Move Info.plist to res/ and update reference in x2goclient.pro. - Fix references of resources in macbuild.sh to access files from TOP_DIR. - Work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. - Work around another bug in qmake and copy icon "manually". - Define wrap_legacy_resources() function and use it to wrap legacy resource locations stored in old session config files. - Add some debugging output to sessionbuttons/userbutton to see what file path is being used as a pixmap (user photo/session icon.) - Add myself to copyright section in the x2goutils headers. - Change four spaces per indentation level to two spaces in x2goutils.cpp. - Add fixup_resources() to x2goutils to fix "broken" resource URI's. - Rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). Update references. - Move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in x2goclient.pro and macbuild.sh. - Add debug mode selector via DEBUG env variable to macbuild.sh. - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. - Select stdlib on OS X based on the passed or default SDK value. - Fix TOP_DIR handling in macbuild.sh. - Switch to BASH interpreter for macbuild.sh. - Also accept "FALSE" and "false" as binary values in macbuild.sh. - Make bundling optional (but enabled by default) via the new BUNDLE environment variable in macbuild.sh. - Enable -O2 in debug mode. Otherwise, debug mode would test different execution paths than release mode. - Add new UNUSED() macro to x2goutils.h and silence compiler warnings. - Fix some QMessageBox usages. There are many more places that need fixing... - Remove config_mac.sh. macbuild.sh handles this now. - Use the correct client build dir in macbuild.sh: client_build. - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. - Use sh default assignment instead of default value in macbuild.sh. Removes the need to redundantly specify the variable name. - App bundle and dmg file will be automatically removed when removing the client build directory. Remove redundancy from macbuild.sh. - Remove 'function' keyword in macbuild.sh, as it's causing undefined behavior according to SUS. - Define and implement new function 'make_boolean()' in macbuild.sh. Takes a pseudo-boolean value and outputs either 0 or 1. Use this function. - Move functions to the start of the macbuild.sh script. - New env var/parameter UNIVERSAL in macbuild.sh. Switches the build architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). - Add usage message to macbuild.sh obtainable via -h or --help. - x2goclient.pro.maemo: cleanup. + Reorder sections so that they match x2goclient.pro. + Adapt to new directory structure. + Various whitespace fixes. - Move OS X-specific stuff from general section to macx section in x2goclient.pro. - Move ICON definition up before it's actually used in the macx section in x2goclient.pro. - Windows: move building into client_build subdirectory. Also needs the changes in buildscripts.git. - Windows: convert and delete the other config or build scripts. Delete obsolete ones. - Windows: correctly reference windows icon. - x2goclient.spec: fix builds on Fedora and related due to failing removal of browserplugin directory. That's non-critical. - onmainwindow.cpp: actually call slotTunnelOk(int), do not generate a run time error by calling the non-existent function slotTunnelOk(). Fixes: #804. - onmainwindow.cpp: clarify message regarding missing SSH daemon host keys. Fixes: #793. - non_modal_messagebox.{cpp,h}: Add new Non_Modal_MessageBox class for non-modal message boxes. - onmainwindow.cpp: use Non_Modal_MessageBox::critical function to display errors relating to missing sshd host keys. Fixes: #794. - onmainwindow.cpp: also make the message about a non-running sshd non-modal. - {x2goclient.pro,res/osxbundle/{Info.plist,postbuild.sh}}: + Add new postbuild script to set the correct version in the processed Info.plist output file. + Use this script in x2goclient.pro as QMAKE_POST_LINK command. + Move Icon copying into that script. + Define version in x2goclient.pro. - onmainwindow.cpp: consolidate Windows and non-Windows sshd startup error message. - onmainwindow.cpp: typo fix (authoized_keys.) - onmainwindow.cpp: stop exporting directories (Printing, File Sharing) on sshd error. - onmainwindow.cpp: fix session icon not being displayed as tray icon (missed legacy resource URI wrapper call.) - configdialog.cpp: update XQuartz outdated version info message and links. Add MacPorts reference. - configdialog.cpp: reformat code, add MacPorts and XQuartz references, URL's and installation instructions, don't show outdated version warning when no XQuartz server is installed. Fixes: #792. - x2goutils.{h,cpp}: use QString references. - x2goutils.{h,cpp}: add new helper function show_RichText_WarningMsgBox. - configdialog.cpp: use new helper function show_RichText_WarningMsgBox to show proper errors. Format as HTML. Use hyperlinks. Rephrase XQuartz warning messages. - configdialog.cpp: return empty strings as paths to the XQuartz application if no valid one could be found in order to show the proper error message. - configdialog.cpp: rephrase another error message, use the new helper and reformat code. - onmainwindow.{cpp,h}: make slotTunnelOk parameter optional and use the non-parameter call for the QSingleShotTimer::timeout() signal. - x2goutils.{h,cpp}: split up show_RichText_WarningMsgBox() into the aforementioned function and a new convert_to_rich_text() helper function. - non_modal_messagebox.{h,cpp}: add new Non_Modal_MessageBox::critical() overloaded functions to be able to use informative text and a (forceful, if requested) conversion to rich text. - onmainwindow.cpp: prettify non-running sshd error message. - onmainwindow.cpp: prettify non-available host key error message. - onmainwindow.cpp: also use usermode sshd on OS X, if no global daemon is running. - onmainwindow.cpp: on OS X, specify sshd's PID file location in its server config. - onmainwindow.cpp: wait 3 seconds before checking sshd startup state to allow it to come up. - onmainwindow.cpp: adapt SSH host key warning message to new usermode sshd possibilities. - configdialog.cpp: make XQuartz detection algorithm QStringList-based and add MacPorts location. - onmainwindow.cpp: do not define Ctrl+Q two times. Made it unusable on Linux and Windows. (Fixes: #830). - onmainwindow:cpp: correctly pass escaped single quote when writing remote xinerama config file. Post-fixup for #797. - {onmainwindow.cpp,README.i18n}: fix localization -- resource strings were not correctly updated. Fixes: #828. - onmainwindow.cpp: quote commands for generating pulse-client.conf correctly, add more quotes and use absolute file path for pulse cookie. - version.h: add include guard. - help.{cpp,h}: add skeleton for new help system. - help.{cpp,h}: add sanitizing helpers. - help.cpp: populate pretty_print: fetch max length of params. - help.cpp: get terminal window sizes on UNIX-based and Windows operating systems. - help.cpp: complete pretty printer function. - help.cpp: "copy" old command line parameters. - help.cpp: document broker options. Fixes: #851. - help.cpp: actually output the help message. - help.{cpp,h}: also pass the help message on (for display in graphical mode.) - x2goclient.pro{,.maemo}: add new help.{cpp,h} files. - onmainwindow.cpp: replace old help system with new one. - {{onmainwindow,help}.cpp},help.h}: fix misc. build errors. - help.h: fix run time error by actually giving QTextStream a "device" to write to. - help.cpp: clear current string if completely written onto one line. - help.cpp: enable debugging for pretty_print(). --debug must be supplied before --help for this to work. - help.cpp: fix splitting algorithm to step over a space character, but include hyphens correctly into the current line. - help.cpp: don't let qCritical() add even more spaces or quotes around the help message. - help.cpp: add support for newlines within descriptions. - help.cpp: use new newline feature for some options. - help.cpp: trying to split at hyphens was a bad idea. Remove that part. - help.cpp: fix a compile warning (by including winsock2.h) and error (caused by a typo) on Windows. - help.cpp: hardcode indentation value to 2 (for the first spaces) + maximum length of parameters + 4 (for the trailing 4 spaces). Calculations via terminal_cols and remaining do not work, if terminal_cols is unknown. - x2goutils.{cpp,h}: implement new git_changelog_extract_commit_sha helper, extracting the most recent commit shasum from a git changelog string. - help.cpp: use new git_changelog_extract_commit_sha() helper while building the help prelude. - helpdialog.cpp: change to monospaced font. - helpdialog.cpp: use QT_VERSION macro to select either a monospaced or typewriter font (Qt < 4.7.0 only supports TypeWriter.) - x2goutils.{cpp,h}: add new font_is_monospaced() helper. - helpdialog.cpp: try harder to set a monospaced font. - helpdialog.cpp: lower font size to have more space for text. - ui/helpdialog.ui: almost double the window size. - help.cpp: typo fix for --git-info. - help.{cpp,h}: provide string splitting logic as separate split_long_line() function. Use this in pretty_print(). - help.cpp: simplify pretty_print() and make it also split lines for non-terminal output or when the terminal width is unknown. - help.{cpp,h}: add a boolean terminal_output parameter to the pretty_print() function family. Controls terminal width auto-detection and automatic printing to stderr. - onmainwindow.cpp: don't let a potential terminal affect the help string shown in the GUI. - help.h: lower default splitting length to 100 characters. - onmainwindow.cpp: fix up pulse config file generation and PULSE_CLIENTCONFIG setting once more. - {macbuild,res/osxbundle/postbuild}.sh: add support for git information if not building from a tag. Also includes build date. - {{configdialog,onmainwindow}.cpp,x2goutils.{cpp,h}}: new helper functions show_XQuartz_not_found_error(), show_XQuartz_start_error() and show_XQuartz_generic_error(). The first two are calling the latter one. Replace previous messages in configdialog.cpp and onmainwindow.cpp with the helpers, because they are supposed to pop up a dialog showing almost the same message. - x2goutils.cpp: fix compile error. tr () is a member of QObject and must be explicitly marked as such in a free function. - {configdialog.{cpp,h},onmainwindow.cpp}: miscellaneous typo fixes - no functional changes. - onmainwindow.cpp: whitespace changes to installTranslator() only. - onmainwindow.cpp: correctly let Qt fetch the UI display language for Qt 4.8.0 and higher. The old "compat" behavior is retained for older versions of Qt, which do not have the semantics of a UI display language. Fixes: #845. - config_win.bat: enable release by default, fetch command line parameter and compare against debug. Enable debug and console features in that case. - onmainwindow.{cpp,h}: follow-up to last translation fix. Actually handle English locales correctly and don't duplicate code too much. - onmainwindow.{cpp,h}: make new get_translator() function static. Correct typo in implementation. - onmainwindow.h: include used types/headers. - onmainwindow.cpp: correctly call QLocale::uiLanguages (). - onmainwindow.cpp: copy strings before manipulating them. - onmainwindow.h: make get_translator() const. Does not change any state. - onmainwindow.cpp: fix compile error triggered by a missing parenthesis/typo. - onmainwindow.cpp: workaround https://bugreports.qt.io/browse/QTBUG-25973. - onmainwindow.h: revert const-qualifier for get_translator(). It's static and can't have any cv-qualifier. - copy-deps-win32.bat: actually let xcopy error correctly. - general: improve debug output and error messages. Affects: + LDAPSession.cpp + configdialog.cpp + contest.cpp + cupsprintersettingsdialog.cpp + exportdialog.cpp + folderexplorer.cpp + httpbrokerclient.cpp + onmainwindow.cpp + onmainwindow.h + printdialog.cpp + printprocess.cpp + printwidget.cpp + sessionbutton.cpp + sessionexplorer.cpp + sessionmanagedialog.cpp + sessionwidget.cpp + settingswidget.cpp + sharewidget.cpp + sshmasterconnection.cpp + sshprocess.cpp + wapi.cpp - sshmasterconnection.cpp: fix typo in last commit leading to a compile failure, correct content, remove superfluous newlines. - sessionexplorer.cpp: use a better shared logic for generating an arguments list for calling x2goclient.exe from a desktop shortcut. Respect the tray icon option also on Windows. Fixes: #871. . [ Fernando Pedemonte ] * New upstream release (4.0.4.0): - onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797. . [ René Genz ] * New upstream release (4.0.4.0): - {LICENSE,debian/copyright}: fix typo in URL of obviously-nice.de. Fixes: #811. . [ Mike Gabriel ] * New upstream release (4.0.4.0): - onmainwindow.cpp: fix desktop sharing via session broker. Fixes: #584. . [ Jason Alavaliant ] * New upstream release (4.0.4.0): - onmainwindow.cpp: handle %i and %c format flags in desktop files correctly: remove the %i flag and replace %c with the application name. Fixes: #827. . [ Nicolas Husson ] * New upstream release (4.0.4.0): - src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. + v2: refactor patch, fix whitespace issues. (Mihai Moldovan) . [ Stefan Baur ] * New upstream release (4.0.4.0): - general: fix spelling and English language syntax issues. Fixes: #389. + v2: apply more fixes in the original changes context. (Mihai Moldovan) ------------=_1432709427-6011-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by bugs.x2go.org; 26 Feb 2015 14:51:30 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 1407F5DCA8 for ; Thu, 26 Feb 2015 15:51:28 +0100 (CET) Received: by pabkx10 with SMTP id kx10so14539507pab.0 for ; Thu, 26 Feb 2015 06:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=UPIBEY8a+3VGxEvgCrT2zPGCjVeOxyO9FmVXxS97nvE=; b=AXessPH/5Rvlccp9aIl79bFvGCgY8JfjuBxpunMl7/pSdiLI9TSej0EwnDF6QB6Z+k ehc95D/3twWUZGZPV/YXw1BgM6ilKs1K9p820ccggz1Tf834obSwVzGqq7rtYznqS4pv I4wg1pAPJrbrh+XwDH6IZL2fE2A7AUJyW3Urs7UNVq/NrYpiGNTKM65byTw6PhtiSx1R OngC6JUBskmq7aT7l+ExPPgpPRaN3/38LEEa9z3rkvcpYfIn72WKS0RIN2qSaqPjVvox FNvyNojmUWp07QPJpMvQTOGh3Zb5LauY10wmLYcI6V/zyn+5C8uOhGTQy2qBpDMo3CVz m6BQ== MIME-Version: 1.0 X-Received: by 10.66.66.108 with SMTP id e12mr14638013pat.31.1424962286669; Thu, 26 Feb 2015 06:51:26 -0800 (PST) Received: by 10.70.74.166 with HTTP; Thu, 26 Feb 2015 06:51:26 -0800 (PST) In-Reply-To: References: Date: Thu, 26 Feb 2015 15:51:26 +0100 Message-ID: Subject: Fwd: Bugs report using ssh proxy with x2goplugin From: nicolas husson To: submit@bugs.x2go.org Content-Type: multipart/mixed; boundary=001a11361ff2eaa12a050ffee279 --001a11361ff2eaa12a050ffee279 Content-Type: multipart/alternative; boundary=001a11361ff2eaa125050ffee277 --001a11361ff2eaa125050ffee277 Content-Type: text/plain; charset=UTF-8 To: submit@bugs.x2go.org From: nicko466@gmail.com Subject: can't use ssh proxy with x2goplugin Package: x2goclient Version: 4.0.3.1 When I'm trying to use the ssh proxy configuration in session file with x2goplugin it seems its not working. Indeed, if you look at the session file in "~/.x2goclient/sessions" which contains all the configuration of the session of x2goclient application you will see all the descriptions of each session. Which looks like this for each session: [20150220100323537] speed=2 pack=16m-jpeg quality=3 fstunnel=true export="/home/user/Bureau/MountDistantX2goPc:1;" iconvto=UTF-8 iconvfrom=ISO8859-1 useiconv=false fullscreen=false multidisp=false display=1 maxdim=false rdpclient=rdesktop directrdpsettings= width=800 height=600 dpi=96 setdpi=true xinerama=false clipboard=both usekbd=true type=auto sound=true soundsystem=pulse startsoundsystem=true soundtunnel=true defsndport=true sndport=4713 print=true name=username icon=:icons/128x128/x2gosession.png host=localhost user=userTest key= rdpport=3389 sshport=2222 autologin=false krblogin=false krbdelegation=false directrdp=false rootless=false published=false applications=WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL command=SHADOW rdpoptions= rdpserver= xdmcpserver=localhost *usesshproxy=true* *sshproxytype=SSH* *sshproxyuser=usernameProxy* *sshproxykeyfile=* *sshproxyhost=123.452.111.124* *sshproxyport=22* *sshproxysamepass=false* *sshproxysameuser=false* *sshproxyautologin=true* *sshproxykrblogin=false* The part which interest me is the bold part. Indeed, it works when i'm using this conf file with x2go client. And when i'm using x2goplugin with this configuration it doesn't work. I take a look at the network traffic and it seems that x2goplugin doesn't look at the bold part (the ssh proxy). This is why I think that x2goplugin doesn't work with ssh proxy. Attachment : 0001-enable-use-of-ssh-proxy-conf-with-x2goplugin.patch -- _________________________________________________________________________ Nicolas HUSSON --001a11361ff2eaa125050ffee277 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Subject: can't use ssh= proxy with x2goplugin
Package: x2goclient<= /div>
Version: 4.0.3.1
When I'm tryin=
g to use the ssh proxy configuration in session file with x2goplugin it see=
ms its not working.
Indeed, if you look at the se= ssion file in "~/.x2goclient/sessions" which contains all the con= figuration of the session of x2goclient application you will see all the de= scriptions of each session. =C2=A0

Which looks lik= e this for each session:



=
[20150220100323537]
speed=3D2
pack=3D16m-jpeg
quality=3D3
fstunnel=3Dtrue
export=3D"/home/= user/Bureau/MountDistantX2goPc:1;"
iconvto=3DUTF-8
iconvfrom=3DISO8859-1
useiconv=3Dfalse
fullscreen=3Dfa= lse
multidisp=3Dfalse
display=3D1
maxdim=3Dfa= lse
rdpclient=3Drdesktop
directrdpsettings=3D
width=3D800
height=3D600
dpi=3D96
setdpi=3Dt= rue
xinerama=3Dfalse
clipboard=3Dboth
usekbd= =3Dtrue
type=3Dauto
sound=3Dtrue
soundsystem= =3Dpulse
startsoundsystem=3Dtrue
soundtunnel=3Dtrue
defsndport=3Dtrue
sndport=3D4713
print=3Dtrue
name=3Dusername
icon=3D:icons/128x128/x2gosession.png
host=3Dlocalhost
user=3DuserTest
key=3D
rdpport=3D3389
sshport=3D2222
autologin=3Dfalse
=
krblogin=3Dfalse
krbdelegation=3Dfalse
directrdp= =3Dfalse
rootless=3Dfalse
published=3Dfalse
a= pplications=3DWWWBROWSER, MAILCLIENT, OFFICE, TERMINAL
command=3D= SHADOW
rdpoptions=3D
rdpserver=3D
xdmcpserver= =3Dlocalhost
usesshproxy=3Dtrue
sshproxytype= =3DSSH
sshproxyuser=3DusernameProxy
sshpr= oxykeyfile=3D
sshproxyhost=3D123.452.111.124
sshproxyport=3D22
sshproxysamepass=3Dfalse
sshproxysameuser=3Dfalse
sshproxyautologin=3Dtrue
sshproxykrblogin=3Dfalse

The pa= rt which interest me is the bold part.=C2=A0
Indeed, it works whe= n i'm using this conf file with x2go client.=C2=A0
And when i= 'm using x2goplugin with this configuration it doesn't work. I take= a look at the network traffic and it seems that x2goplugin doesn't loo= k at the bold part (the ssh proxy).
This is why I think that x2go= plugin doesn't work with ssh proxy.

Atta= chment : 0001-enable-use-of-ssh-proxy-conf-with-x2goplugin.patch
-- 
_________________________________________________________________________
Nicolas HUSSON

--001a11361ff2eaa125050ffee277-- --001a11361ff2eaa12a050ffee279 Content-Type: text/x-patch; charset=US-ASCII; name="0001-enable-use-of-ssh-proxy-conf-with-x2goplugin.patch" Content-Disposition: attachment; filename="0001-enable-use-of-ssh-proxy-conf-with-x2goplugin.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i6m14tne0 RnJvbSA4YTZiMmJhOTIwMWQ0YzNmZjU2NGQyODEzNzE2MjU5OGFmZmM4MzEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdXNzb24gPG5pY29sYXMuaHVzc29uQHRhY3R1YWxpdGllcy5j b20+CkRhdGU6IFdlZCwgMjUgRmViIDIwMTUgMTY6MDk6MjMgKzAxMDAKU3ViamVjdDogW1BBVENI XSBlbmFibGUgdXNlIG9mIHNzaCBwcm94eSBjb25mIHdpdGggeDJnb3BsdWdpbgoKLS0tCiBvbm1h aW53aW5kb3cuY3BwICAgICAgICB8IDE3NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0KIHNzaG1hc3RlcmNvbm5lY3Rpb24uY3BwIHwgICA4ICsrLQogMiBm aWxlcyBjaGFuZ2VkLCAxMzMgaW5zZXJ0aW9ucygrKSwgNTAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvb25tYWlud2luZG93LmNwcCBiL29ubWFpbndpbmRvdy5jcHAKaW5kZXggM2MyOTg3MC4u YTQxNjllMCAxMDA2NDQKLS0tIGEvb25tYWlud2luZG93LmNwcAorKysgYi9vbm1haW53aW5kb3cu Y3BwCkBAIC0xNiw2ICsxNiw3IEBACiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAKICNpbmNsdWRlICJv bm1haW53aW5kb3dfcHJpdmF0LmgiCisjaW5jbHVkZSA8aW9zdHJlYW0+CiAKIHZvaWQgeDJnb1Nl c3Npb246Om9wZXJhdG9yID0gKCBjb25zdCB4MmdvU2Vzc2lvbiYgcyApCiB7CkBAIC01OCw3ICs1 OSw3IEBAIE9OTWFpbldpbmRvdzo6T05NYWluV2luZG93ICggUVdpZGdldCAqcGFyZW50ICkgOlFN YWluV2luZG93ICggcGFyZW50ICkKICAgICBpbWFnZT1zaGFwZT0wOwogI2VuZGlmCiAgICAgeDJn b0luZm9mKDEpIDw8IHRyKCJTdGFydGluZyB4MmdvY2xpZW50Li4uIik7Ci0gICAgZGVidWdnaW5n ID0gZmFsc2U7CisgICAgZGVidWdnaW5nID0gdHJ1ZTsKIAogICAgIHNldEZvY3VzUG9saWN5ICgg UXQ6Ok5vRm9jdXMgKTsKICAgICBpbnN0YWxsVHJhbnNsYXRvcigpOwpAQCAtMzIwNCw2ICszMjA1 LDcgQEAgUVN0cmluZyBPTk1haW5XaW5kb3c6OmZpbmRTc2hLZXlGb3JTZXJ2ZXIoUVN0cmluZyB1 c2VyLCBRU3RyaW5nIHNlcnZlciwgUVN0cmluZwogCiBib29sIE9OTWFpbldpbmRvdzo6c3RhcnRT ZXNzaW9uICggY29uc3QgUVN0cmluZyYgc2lkICkKIHsKKwogICAgIHNldEVuYWJsZWQgKCBmYWxz ZSApOwogI2lmZGVmIFFfT1NfTElOVVgKICAgICBkaXJlY3RSRFA9ZmFsc2U7CkBAIC0zMjYxLDYg KzMyNjMsNyBAQCBib29sIE9OTWFpbldpbmRvdzo6c3RhcnRTZXNzaW9uICggY29uc3QgUVN0cmlu ZyYgc2lkICkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICggUVZhcmlhbnQg KSBRU3RyaW5nOjpudWxsICkudG9TdHJpbmcoKTsKICAgICB9CiAKKwogICAgIFFTdHJpbmcgY21k PXN0LT5zZXR0aW5nKCktPnZhbHVlICggc2lkKyIvY29tbWFuZCIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoIFFWYXJpYW50ICkgUVN0cmluZzo6bnVsbCApLnRvU3Ry aW5nKCk7CiAgICAgYXV0b2xvZ2luPXN0LT5zZXR0aW5nKCktPnZhbHVlICggc2lkKyIvYXV0b2xv Z2luIiwKQEAgLTMyOTYsNDUgKzMyOTksNjggQEAgYm9vbCBPTk1haW5XaW5kb3c6OnN0YXJ0U2Vz c2lvbiAoIGNvbnN0IFFTdHJpbmcmIHNpZCApCiAgICAgICAgIGN1cnJlbnRLZXk9ZmluZFNzaEtl eUZvclNlcnZlcih1c2VyLCBob3N0LCBzc2hQb3J0KTsKICAgICB9CiAKLSAgICB1c2Vwcm94eT0o c3QtPnNldHRpbmcoKS0+dmFsdWUgKAotICAgICAgICAgICAgICAgICAgc2lkKyIvdXNlc3NocHJv eHkiLAotICAgICAgICAgICAgICAgICAgZmFsc2UKLSAgICAgICAgICAgICAgKS50b0Jvb2woKSAp OwotCi0gICAgUVN0cmluZyBwcnR5cGU9IHN0LT5zZXR0aW5nKCktPnZhbHVlICgKLSAgICAgICAg ICAgICAgICAgICAgICAgIHNpZCsiL3NzaHByb3h5dHlwZSIsCi0gICAgICAgICAgICAgICAgICAg ICAgICAiU1NIIgotICAgICAgICAgICAgICAgICAgICApLnRvU3RyaW5nKCkgOwotCi0gICAgaWYo cHJ0eXBlPT0iSFRUUCIpCi0gICAgewotICAgICAgICBwcm94eVR5cGU9U3NoTWFzdGVyQ29ubmVj dGlvbjo6UFJPWFlIVFRQOwotICAgIH0KLSAgICBlbHNlCi0gICAgewotICAgICAgICBwcm94eVR5 cGU9U3NoTWFzdGVyQ29ubmVjdGlvbjo6UFJPWFlTU0g7Ci0gICAgfQotCi0gICAgcHJveHlsb2dp bj0oc3QtPnNldHRpbmcoKS0+dmFsdWUgKAotICAgICAgICAgICAgICAgICAgICBzaWQrIi9zc2hw cm94eXVzZXIiLAotICAgICAgICAgICAgICAgICAgICBRU3RyaW5nKCkKLSAgICAgICAgICAgICAg ICApLnRvU3RyaW5nKCkgKTsKLQotICAgIHByb3h5S2V5PShzdC0+c2V0dGluZygpLT52YWx1ZSAo Ci0gICAgICAgICAgICAgICAgICBzaWQrIi9zc2hwcm94eWtleWZpbGUiLAotICAgICAgICAgICAg ICAgICAgUVN0cmluZygpCi0gICAgICAgICAgICAgICkudG9TdHJpbmcoKSApOwotICAgIHByb3h5 S2V5PWV4cGFuZEhvbWUocHJveHlLZXkpOwotCi0gICAgcHJveHlzZXJ2ZXI9KHN0LT5zZXR0aW5n KCktPnZhbHVlICgKLSAgICAgICAgICAgICAgICAgICAgIHNpZCsiL3NzaHByb3h5aG9zdCIsCi0g ICAgICAgICAgICAgICAgICAgICBRU3RyaW5nKCkKLSAgICAgICAgICAgICAgICAgKS50b1N0cmlu ZygpICk7CisgICAgaWYgKGVtYmVkTW9kZSkKKwl7CisgICAgCXVzZXByb3h5PWNvbmZpZy51c2Vw cm94eTsKKyAgICAJcHJveHlUeXBlPWNvbmZpZy5wcm94eVR5cGU7CisgICAgCXByb3h5bG9naW49 Y29uZmlnLnByb3h5bG9naW47CisgICAgCXByb3h5S2V5PWNvbmZpZy5wcm94eUtleTsKKyAgICAJ cHJveHlzZXJ2ZXI9Y29uZmlnLnByb3h5c2VydmVyOworICAgIAlwcm94eXBvcnQ9Y29uZmlnLnBy b3h5cG9ydDsKKyAgICAJcHJveHlBdXRvbG9naW49Y29uZmlnLnByb3h5QXV0b2xvZ2luOworICAg IAlwcm94eUtyYkxvZ2luPWNvbmZpZy5wcm94eUtyYkxvZ2luOworCX0KKwllbHNlCisJeworCQl1 c2Vwcm94eT0oc3QtPnNldHRpbmcoKS0+dmFsdWUgKAorCQkJCQkgIHNpZCsiL3VzZXNzaHByb3h5 IiwKKwkJCQkJICBmYWxzZQorCQkJCSAgKS50b0Jvb2woKSApOworCQlRU3RyaW5nIHBydHlwZT0g c3QtPnNldHRpbmcoKS0+dmFsdWUgKAorCQkJCQkJCSBzaWQrIi9zc2hwcm94eXR5cGUiLAorCQkJ CQkJCSAiU1NIIgorCQkJCQkJICkudG9TdHJpbmcoKSA7CisJCWlmKHBydHlwZT09IkhUVFAiKQor CQl7CisJCSAgcHJveHlUeXBlPVNzaE1hc3RlckNvbm5lY3Rpb246OlBST1hZSFRUUDsKKwkJfQor CQllbHNlCisJCXsKKwkJICBwcm94eVR5cGU9U3NoTWFzdGVyQ29ubmVjdGlvbjo6UFJPWFlTU0g7 CisKKwkJfQorCisJCXByb3h5bG9naW49KHN0LT5zZXR0aW5nKCktPnZhbHVlICgKKwkJCQkJCXNp ZCsiL3NzaHByb3h5dXNlciIsCisJCQkJCQlRU3RyaW5nKCkKKwkJCQkJKS50b1N0cmluZygpICk7 CisKKwkJcHJveHlLZXk9KHN0LT5zZXR0aW5nKCktPnZhbHVlICgKKwkJCQkJICBzaWQrIi9zc2hw cm94eWtleWZpbGUiLAorCQkJCQkgIFFTdHJpbmcoKQorCQkJCSAgKS50b1N0cmluZygpICk7CisJ CXByb3h5S2V5PWV4cGFuZEhvbWUocHJveHlLZXkpOworCisJCXByb3h5c2VydmVyPShzdC0+c2V0 dGluZygpLT52YWx1ZSAoCisJCQkJCQkgc2lkKyIvc3NocHJveHlob3N0IiwKKwkJCQkJCSBRU3Ry aW5nKCkKKwkJCQkJICkudG9TdHJpbmcoKSApOworCisJCXByb3h5cG9ydD0oc3QtPnNldHRpbmco KS0+dmFsdWUgKAorCQkJCQkgICBzaWQrIi9zc2hwcm94eXBvcnQiLAorCQkJCQkgICAyMgorCQkJ CSAgICkudG9JbnQoKSApOworCQlwcm94eUF1dG9sb2dpbj0oc3QtPnNldHRpbmcoKS0+dmFsdWUg KAorCQkJCQkJc2lkKyIvc3NocHJveHlhdXRvbG9naW4iLAorCQkJCQkJZmFsc2UKKwkJCQkJKS50 b0Jvb2woKSApOworCisJICAgIHByb3h5S3JiTG9naW49KHN0LT5zZXR0aW5nKCktPnZhbHVlICgK KwkgICAgICAgICAgICAgICAgICAgICAgIHNpZCsiL3NzaHByb3h5a3JibG9naW4iLAorCSAgICAg ICAgICAgICAgICAgICAgICAgZmFsc2UKKwkgICAgICAgICAgICAgICAgICAgKS50b0Jvb2woKSAp OworCX0KIAotICAgIHByb3h5cG9ydD0oc3QtPnNldHRpbmcoKS0+dmFsdWUgKAotICAgICAgICAg ICAgICAgICAgIHNpZCsiL3NzaHByb3h5cG9ydCIsCi0gICAgICAgICAgICAgICAgICAgMjIKLSAg ICAgICAgICAgICAgICkudG9JbnQoKSApOwogICAgIGlmKHByb3h5c2VydmVyLmluZGV4T2YoIjoi KSE9LTEpCiAgICAgewogICAgICAgICBRU3RyaW5nTGlzdCBwYXJ0cz1wcm94eXNlcnZlci5zcGxp dCgiOiIpOwpAQCAtMzM1MCwxNSArMzM3Niw2IEBAIGJvb2wgT05NYWluV2luZG93OjpzdGFydFNl c3Npb24gKCBjb25zdCBRU3RyaW5nJiBzaWQgKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNpZCsiL3NzaHByb3h5c2FtZXVzZXIiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZh bHNlCiAgICAgICAgICAgICAgICAgICAgICAgICApLnRvQm9vbCgpICk7Ci0gICAgcHJveHlBdXRv bG9naW49KHN0LT5zZXR0aW5nKCktPnZhbHVlICgKLSAgICAgICAgICAgICAgICAgICAgICAgIHNp ZCsiL3NzaHByb3h5YXV0b2xvZ2luIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIGZhbHNlCi0g ICAgICAgICAgICAgICAgICAgICkudG9Cb29sKCkgKTsKLQotICAgIHByb3h5S3JiTG9naW49KHN0 LT5zZXR0aW5nKCktPnZhbHVlICgKLSAgICAgICAgICAgICAgICAgICAgICAgc2lkKyIvc3NocHJv eHlrcmJsb2dpbiIsCi0gICAgICAgICAgICAgICAgICAgICAgIGZhbHNlCi0gICAgICAgICAgICAg ICAgICAgKS50b0Jvb2woKSApOwogCiAgICAgaWYocHJveHlLZXkubGVuZ3RoKCk8PTAgJiYgcHJv eHlUeXBlPT1Tc2hNYXN0ZXJDb25uZWN0aW9uOjpQUk9YWVNTSCkKICAgICB7CkBAIC0xMDQ3MSw3 ICsxMDQ4OCw3IEBAIHZvaWQgT05NYWluV2luZG93Ojpwcm9jZXNzU2Vzc2lvbkNvbmZpZygpCiAg ICAgewogICAgICAgICBRU3RyaW5nIGxpbmUgPSBsaW5lc1tpXTsKIAotICAgICAgICAvLyBzdHJp cCBsZWZ0L3JpZ2h0IHdoaXRlc3BhY2VzLCBpbXBvcnRhbnQgZm9yIHBsdWdpbiBzZXR0aW5ncyB2 aWEgeDJnb2NvbmZpZworICAgICAgICAvLyBzdHJpcCBsZWZ0L3JpZ2h0IHdoaXRlc3BhY2VzLCBp bXBvcnRhbnQgZm9yIHBsdWdpbiBzZXR0aW5ncyB2aWEgeDJnbwogICAgICAgICBsaW5lLnJlbW92 ZShRUmVnRXhwKCJeXFxzKyIpKTsKICAgICAgICAgbGluZS5yZW1vdmUoUVJlZ0V4cCgiXFxzKyQi KSk7CiAKQEAgLTEwNzAyLDYgKzEwNzE5LDY2IEBAIHZvaWQgT05NYWluV2luZG93Ojpwcm9jZXNz Q2ZnTGluZSAoIFFTdHJpbmcgbGluZSApCiAgICAgICAgIGNvbmZpZy5jb25uZWN0aW9udHM9bHN0 WzFdOwogICAgICAgICByZXR1cm47CiAgICAgfQorICAgIGlmICggbHN0WzBdPT0idXNlc3NocHJv eHkiICkKKwl7CisgICAgCWNvbmZpZy51c2Vwcm94eT10cnVlOworICAgIAkvKmlmIChsc3RbMV09 PSJ0cnVlIil7CisgICAgCQlzdGQ6OmNvdXQgPDwgInVzZXNzaHByb3h5IiA8PCBzdGQ6OmVuZGw7 CisgICAgCQljb25maWcudXNlcHJveHk9dHJ1ZTsKKyAgICAJfQorICAgIAllbHNlCisgICAgCQlj b25maWcudXNlcHJveHk9ZmFsc2U7Ki8KKyAgICAJIHJldHVybjsKKwl9CisgICAgaWYgKCBsc3Rb MF09PSJzc2hwcm94eXR5cGUiICkKKyAgIAl7CisgICAgCWlmIChsc3RbMV09PSJIVFRQIil7Cisg ICAgCQljb25maWcucHJveHlUeXBlPVNzaE1hc3RlckNvbm5lY3Rpb246OlBST1hZSFRUUDsKKyAg ICAJfQorICAgIAllbHNleworICAgIAkJc3RkOjpjb3V0IDw8ICJzc2giIDw8IHN0ZDo6ZW5kbDsK KyAgICAJCWNvbmZpZy5wcm94eVR5cGU9U3NoTWFzdGVyQ29ubmVjdGlvbjo6UFJPWFlTU0g7Cisg ICAgCX0KKyAgICAgICAJcmV0dXJuOworICAgCX0KKyAgICBpZiAoIGxzdFswXT09InNzaHByb3h5 dXNlciIgKQorCXsKKwkJIGNvbmZpZy5wcm94eWxvZ2luPWxzdFsxXTsKKwkJIHJldHVybjsKKwl9 CisgICAgaWYgKCBsc3RbMF09PSJzc2hwcm94eWhvc3QiICkKKyAgIAl7CisgICAJCSBjb25maWcu cHJveHlzZXJ2ZXI9bHN0WzFdOworICAgCQkgcmV0dXJuOworICAgCX0KKyAgICBpZiAoIGxzdFsw XT09InNzaHByb3h5cG9ydCIgKQorCXsKKwkJIGNvbmZpZy5wcm94eXBvcnQ9bHN0WzFdLnRvSW50 KCk7CisJCSByZXR1cm47CisJfQorICAgIGlmICggbHN0WzBdPT0ic3NocHJveHlhdXRvbG9naW4i ICkKKwl7CisgICAgCWlmIChsc3RbMV09PSJ0cnVlIikKKyAgICAJCWNvbmZpZy5wcm94eUF1dG9s b2dpbj10cnVlOworCQllbHNlCisJCQljb25maWcucHJveHlBdXRvbG9naW49ZmFsc2U7CisJCXJl dHVybjsKKwl9CisgICAgaWYgKCBsc3RbMF09PSJzc2hwcm94eWtyYmxvZ2luIiApCisgICAJewor ICAgIAlpZiAobHN0WzFdPT0idHJ1ZSIpCisgICAgCQljb25maWcucHJveHlLcmJMb2dpbj10cnVl OworCQllbHNlCisJCQljb25maWcucHJveHlLcmJMb2dpbj1mYWxzZTsKKwkJcmV0dXJuOworICAg CX0KKyAgICBpZiAoIGxzdFswXT09InNzaHByb3h5a2V5ZmlsZSIgKQorCXsKKwkJIGNvbmZpZy5w cm94eUtleT1sc3RbMV07CisJCSByZXR1cm47CisJfQorCisKIH0KIAogdm9pZCBPTk1haW5XaW5k b3c6OnNsb3RDaGFuZ2VLYmRMYXlvdXQoY29uc3QgUVN0cmluZyYgbGF5b3V0KQpkaWZmIC0tZ2l0 IGEvc3NobWFzdGVyY29ubmVjdGlvbi5jcHAgYi9zc2htYXN0ZXJjb25uZWN0aW9uLmNwcAppbmRl eCBjODY2OWE1Li43MjkxMTBlIDEwMDc1NQotLS0gYS9zc2htYXN0ZXJjb25uZWN0aW9uLmNwcAor KysgYi9zc2htYXN0ZXJjb25uZWN0aW9uLmNwcApAQCAtMTY1LDYgKzE2NSw3IEBAIFNzaE1hc3Rl ckNvbm5lY3Rpb246OlNzaE1hc3RlckNvbm5lY3Rpb24gKFFPYmplY3QqIHBhcmVudCwgUVN0cmlu ZyBob3N0LCBpbnQgcG9yCiAKICAgICBicmVha0xvb3A9ZmFsc2U7CiAgICAga2VyYmVyb3NEZWxl Z2F0aW9uPWZhbHNlOworICAgIC8veDJnb0RlYnVnPDwiU3NoTWFzdGVyQ29ubmVjdGlvbiwgaG9z dCAiPDxob3N0ICA8PCJwb3J0ICI8PCBwb3J0IDw8InVzZXIgIjw8dXNlcjw8InVzZXByb3h5ICI8 PCB1c2Vwcm94eTw8InByb3h5c2VydmVyICI8PCBwcm94eXNlcnZlcjw8InByb3h5cG9ydCAiPDwg cHJveHlwb3J0IDsKICAgICB0aGlzLT5ob3N0PWhvc3Q7CiAgICAgdGhpcy0+cG9ydD1wb3J0Owog ICAgIHRoaXMtPnVzZXI9dXNlcjsKQEAgLTQ0MSw5ICs0NDIsMTQgQEAgdm9pZCBTc2hNYXN0ZXJD b25uZWN0aW9uOjpydW4oKQogI2lmZGVmIERFQlVHCiAgICAgeDJnb0RlYnVnPDwiU3NoTWFzdGVy Q29ubmVjdGlvbiwgaW5zdGFuY2UgIjw8dGhpczw8IiBlbnRlcmluZyB0aHJlYWQiOwogI2VuZGlm CisgICAgeDJnb0RlYnVnPDwidXNlIG9mIHByb3h5c3NoPyI7CisgICAgaWYgKHVzZXByb3h5KQor ICAgIAkgLy94MmdvRGVidWc8PCJ1c2Vwcm94eSBzc2giOworICAgIGlmIChwcm94eXR5cGU9PVBS T1hZU1NIKQorICAgIAkvL3gyZ29EZWJ1Zzw8IlBST1hZU1NIIjsKICAgICBpZih1c2Vwcm94eSAm JiBwcm94eXR5cGU9PVBST1hZU1NIKQogICAgIHsKLQorICAgIAkvLyB4MmdvRGVidWc8PCJ5ZXMg Ijw8InByb3h5c2VydmVyIDogIjw8cHJveHlzZXJ2ZXI8PCJwcm94eXBvcnQgOiAiPDxwcm94eXBv cnQ8PCJwcm94eWxvZ2luIDogIjw8cHJveHlsb2dpbjsKICAgICAgICAgc3NoUHJveHk9bmV3IFNz aE1hc3RlckNvbm5lY3Rpb24gKDAsIHByb3h5c2VydmVyLCBwcm94eXBvcnQsYWNjZXB0VW5rbm93 blNlcnZlcnMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm94 eWxvZ2luLCBwcm94eXBhc3N3b3JkLCBwcm94eWtleSwgcHJveHlhdXRvbG9naW4sIHByb3h5S3Ji TG9naW4sIGZhbHNlKTsKICAgICAgICAgY29ubmVjdCAoIHNzaFByb3h5LCBTSUdOQUwgKCBjb25u ZWN0aW9uT2soUVN0cmluZykgKSwgdGhpcywgU0xPVCAoIHNsb3RTc2hQcm94eUNvbm5lY3Rpb25P aygpICkgKTsKLS0gCjEuOS4xCgo= --001a11361ff2eaa12a050ffee279-- ------------=_1432709427-6011-0--