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--