From aw@old-forest.org  Wed Mar  8 13:54:05 2017
Received: (at 1122) by bugs.x2go.org; 8 Mar 2017 12:54:07 +0000
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=3.0 tests=BAYES_50,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.1
Received: from localhost (localhost [127.0.0.1])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 1A6FF5DA85;
	Wed,  8 Mar 2017 13:54:05 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at ymir.das-netzwerkteam.de
Received: from ymir.das-netzwerkteam.de ([127.0.0.1])
	by localhost (ymir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id oJMjHbLV8j4x; Wed,  8 Mar 2017 13:53:58 +0100 (CET)
X-Greylist: delayed 569 seconds by postgrey-1.35 at ymir.das-netzwerkteam.de; Wed, 08 Mar 2017 13:53:58 CET
Received: from apu.snow-crash.org (crusty.snow-crash.org [213.239.193.199])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 39D8D5DA2B;
	Wed,  8 Mar 2017 13:53:58 +0100 (CET)
Received: from chao-revive (arne.local [10.99.0.2])
	by apu.snow-crash.org (Postfix) with ESMTP id 0F1F78061B;
	Wed,  8 Mar 2017 13:44:29 +0100 (CET)
Received: from [192.168.10.23] (helo=anhrefn.saar.de)
	by chao-revive with esmtps (Exim 4.88)
	(envelope-from <aw@old-forest.org>)
	id 1clayk-00077b-U5; Wed, 08 Mar 2017 13:46:06 +0100
Received: from aw by anhrefn.saar.de with local (Exim 4.88)
	(envelope-from <aw@old-forest.org>)
	id 1clax4-0006eM-0S; Wed, 08 Mar 2017 13:44:22 +0100
Date: Wed, 8 Mar 2017 13:44:11 +0100
From: Arne Wichmann <aw@anhrefn.saar.de>
To: 1122@bugs.x2go.org
Cc: control@bugs.x2go.org
Subject: Patch
Message-ID: <20170308124411.GB16588@anhrefn.saar.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="0eh6TmSyL6TZE2Uz"
Content-Disposition: inline
Return-Receipt-To: aw@anhrefn.saar.de
X-message-flag: Outluck ist kaputt :-)
User-Agent: Mutt/1.5.23 (2014-03-12)


--0eh6TmSyL6TZE2Uz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

tag #1122 patch
thanks

Hi...

So, I created an experimental patch which makes the problem go away.

cu

AW

----
diff --git a/debian/changelog b/debian/changelog
index dc1fbbf..c57c678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x2goclient (4.1.0.1-0x2go1.1) UNRELEASED; urgency=3Dmedium
+
+  * Non-maintainer upload.
+  * Do not ask passphrase on autologin
+
+ -- Arne Wichmann <aw@saar.de>  Wed, 08 Mar 2017 13:32:51 +0100
+
 x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=3Dmedium
=20
   [ Mihai Moldovan ]
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 8e620c2..ab6398e 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1150,6 +1150,8 @@ bool SshMasterConnection::userAuthAuto()
 {
     int rc =3D ssh_userauth_autopubkey ( my_ssh_session, "" );
     int i=3D0;
+#define NO_PASSPHRASE_ON_AUTOLOGIN
+#ifndef NO_PASSPHRASE_ON_AUTOLOGIN
     while(rc !=3D SSH_AUTH_SUCCESS)
     {
         keyPhraseReady=3Dfalse;
@@ -1173,6 +1175,7 @@ bool SshMasterConnection::userAuthAuto()
             break;
         }
     }
+#endif
=20
     if ( rc !=3D SSH_AUTH_SUCCESS )
     {
----

--=20
[...] If you don't want to be restricted, don't agree to it. If you are
coerced, comply as much as you must to protect yourself, just don't support
it. Noone can free you but yourself. (crag, on Debian Planet)
Arne Wichmann (aw@saar.de)

--0eh6TmSyL6TZE2Uz
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJYv/yVAAoJEBCK3pl2AP+JBmsP/iRrOEgrGYMIBM6quaLHD2NJ
ynFvYVhlFtfUYJTOqXpSzxCfOv+1ZaPG55UbbJPQfVGp4WaKM4yfFZwQU/UIcpcV
BBCtxBXAL2nIVYNPNslnBqeoEfW7ZRWG00do4AkxERM8ID5aHLe27YinSFmrNFQj
U6viNLWUCk5An45A0pC6kUd3BJwusfxWsbLqXRFlRiIPxq5crd1q8AsRe8NJGvZc
LLfR2HomvF0wNM84o4YmpkF3YAEmAzj55rJ/eSb2uwQuckFZ6Scb5F5IRcrOQ/UR
q50e4GleiQpkKRG0sjsb4AehPr+zj4W01S993saRq2YRbngMIZjW74A8khl/e5K5
yXJ6SjM+tSP3yXl9c9ZMhHGufArs988T1YeEZUW8MqOK21PWQO5TJ3u+OKeV7wNk
hmRUYCf7XEtHA6unOLq89GlxKiGiaHIH5CNAek2IukvTCAYqiKaBlEEm66m1D9ye
62+93aPIW781vCjkNJMuyawFdTiPIsa8YDesE7hIljUrMqXCiJittL5bauJHQnPR
uh+Y3yAgOrVQDNGaAYBO3UCyTi8p9iv+r7QYPhDKIzlK6zsilJU/HTCXZsTnUreh
ojxOHNbordtf/z2yY6U8BJLKNWI6RwtgfYZduvSoMybARdDrboMtbpZj5zg3AC1b
8AAfv0aTHvph9tLtkImT
=Flx9
-----END PGP SIGNATURE-----

--0eh6TmSyL6TZE2Uz--

