[X2Go-Commits] [[X2Go Wiki]] page changed: events:start

2017-11-10 Thread wiki-admin 

A page in your DokuWiki was added or changed. Here are the details:

Date: 2017/11/10 23:38
Browser : Mozilla/5.0 (X11; Linux x86_64; rv:52.9) Gecko/20100101 
Goanna/3.3 Firefox/52.9 PaleMoon/27.5.1
IP-Address  : 134.3.37.90
Hostname: HSI-KBW-134-3-37-90.hsi14.kabel-badenwuerttemberg.de
Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1510357001
New Revision: https://wiki.x2go.org/doku.php/events:start
Edit Summary: [LinuxDay.AT 2017, Dornbirn, Austria - (2017-12-02 - yes, 
DECEMBER)] updated booth staff list
User: stefanbaur

@@ -8,14 +8,15 @@
 
  LinuxDay.AT 2017, Dornbirn, Austria - (2017-12-02 - yes, DECEMBER) 

   * Booths & Talks confirmed (X2Go & ORCA)
 * confirmed booth staff for X2Go: 
-   * Stefan#1

   * ionic
+   * Stefan#1
   * Stefan#2 as temporary stand-in
 * potential booth staff for ORCA:
-   * h1
   * Bernhard (xfreerdp)
+   * h1
+   * Juri
 * X2Go Talk: X2Go-TCE-Live - the
universal Thin Client Environment
 * ORCA Talk: What it REALLY means to access a system remotely (h1)
   * LinuxDay.AT Event Info can be found here: https://www.linuxday.at/
 



--
This mail was generated by DokuWiki at
https://wiki.x2go.org/

___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [[X2Go Wiki]] page changed: events:start

2017-11-10 Thread wiki-admin 

A page in your DokuWiki was added or changed. Here are the details:

Date: 2017/11/10 23:36
Browser : Mozilla/5.0 (X11; Linux x86_64; rv:52.9) Gecko/20100101 
Goanna/3.3 Firefox/52.9 PaleMoon/27.5.1
IP-Address  : 134.3.37.90
Hostname: HSI-KBW-134-3-37-90.hsi14.kabel-badenwuerttemberg.de
Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1509738512
New Revision: https://wiki.x2go.org/doku.php/events:start
Edit Summary: IT-Kongress 2017 -> Past Events
User: stefanbaur

@@ -17,21 +17,22 @@
   * Bernhard (xfreerdp)
 * X2Go Talk: X2Go-TCE-Live - the universal Thin Client Environment
 * ORCA Talk: What it REALLY means to access a system remotely (h1)
   * LinuxDay.AT Event Info can be found here: https://www.linuxday.at/
+ 
+ = Past Events =

  IT-Kongress 2017, Neu-Ulm, Germany (2017-11-09) 
-   * As one of the X2Go core team members is on the planning committee, we'll 
have a small booth again, as in the previous years
-  
* This year's talk will be about the new X2Go-TCE-Live

+   * As one of the X2Go core team members is on the planning committee, we had 
a small booth again, as in the previous years
+   * This year's talk was be about the new X2Go-TCE-Live
   * Booth staff (see below) should arrive at 07:00 CET
 * Stefan#1
 * ionic
- * Hans Bonfigt
-   * Event opens for the public at 09:30 CET and closes around 17:00 CET
+ * Hans Bonfigt
+   * Event opened for the public at 09:30 CET and closes around 17:00 CET
   * More info can be found here: [[http://it-kongress.com]]
   * Full event schedule is available 
[[https://www.it-kongress.com/programm.php|here]]
 
 
- = Past Events =

  IBM Power Systems Strategy Days, Ehningen, Germany (2017-10-10) 
   * Stefan (BAUR-ITCS) and Juri will be representing X2Go at this event
   * You need to register for this event if you want to attend it; as far as we 
know, there are no fees involved.
([[https://www-01.ibm.com/events/wwe/grp/grp312.nsf/Registration.xsp?openform=354H8DOE=de_DE=anonymous|Registration
 link]])
   * The event takes place on both 2017-10-10 and 2017-10-11, however, X2Go 
will only be present on 2017-10-10!


--
This mail was generated by DokuWiki at
https://wiki.x2go.org/

___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [nx-libs] 01/01: nx-libs.spec: fix SHLIBSGLOBALSFLAGS => SHLIBGLOBALSFLAGS typo spotted by Orion Poplawski.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 71511a765365ef9ad2684a82c45dd95911f55bb7
Author: Mihai Moldovan 
Date:   Fri Nov 10 23:14:13 2017 +0100

nx-libs.spec: fix SHLIBSGLOBALSFLAGS => SHLIBGLOBALSFLAGS typo spotted by 
Orion Poplawski.
---
 debian/changelog | 5 -
 nx-libs.spec | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 951a7ec..ce09b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 nx-libs (2:3.5.0.34-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Mihai Moldovan ]
+  * nx-libs.spec:
+- Fix SHLIBSGLOBALSFLAGS => SHLIBGLOBALSFLAGS typo spotted by Orion
+  Poplawski.
 
  -- X2Go Release Manager   Wed, 08 Nov 2017 11:18:57 +0100
 
diff --git a/nx-libs.spec b/nx-libs.spec
index df2d5a5..7a72280 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -766,7 +766,7 @@ chmod a+x my_configure;
 export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
 export LOCAL_LDFLAGS="%{__global_ldflags}"
 export CDEBUGFLAGS="%{?__global_cppflags} %{?__global_cflags}"
-make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} 
USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" 
LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBSGLOBALSFLAGS="${SHLIBSGLOBALSFLAGS}"
+make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} 
USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" 
LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}"
 
 %install
 make install \

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on 
/srv/git/code.x2go.org/nx-libs.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 03/06: src/sshmasterconnection.cpp: query for password if it wasn't already provided.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit d0be65ee5177c2df4761c1fba18e2967b49951aa
Author: Mihai Moldovan 
Date:   Fri Nov 10 21:33:46 2017 +0100

src/sshmasterconnection.cpp: query for password if it wasn't already 
provided.

This usually happens if auto-login is enabled, which bypasses the
password prompt. If auto-login fails, authentication normally continues
via challenge auth or plain passwords, but since users had no chance to
input a password, such authentication will always fail.

Give users a way to enter passwords, in case the auto-login failed.
---
 debian/changelog|  6 +
 src/sshmasterconnection.cpp | 55 -
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13568ba..5a04c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
   since we also have to use it in SshMasterConnection, that may not
   include onmainwindow.h to avoid a circular dependency, it has to be
   part of SshMasterConnection for now.
+- src/sshmasterconnection.cpp: query for password if it wasn't already
+  provided. This usually happens if auto-login is enabled, which bypasses
+  the password prompt. If auto-login fails, authentication normally
+  continues via challenge auth or plain passwords, but since users had no
+  chance to input a password, such authentication will always fail. Give
+  users a way to enter passwords, in case the auto-login failed.
 
   [ Oleksandr Shneyder ]
   * Change echo mode for user input in InteractionDialog.
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 7831265..fb0dee8 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1250,36 +1250,51 @@ bool SshMasterConnection::userAuthWithPass()
 
 int method = ssh_userauth_list(my_ssh_session, NULL);
 
-if (method& SSH_AUTH_METHOD_INTERACTIVE)
-{
-#ifdef DEBUG
-x2goDebug<<"Challenge authentication requested."<usleep (200);
+
+keyPhraseMutex.lock ();
+ready = keyPhraseReady;
+keyPhraseMutex.unlock ();
+}
+
+if (keyPhrase.isNull ()) {
+return (ret);
+}
+else {
+auth_password = keyPhrase;
+}
+}
+int rc = ssh_userauth_password (my_ssh_session, NULL, 
auth_password.toLatin1 ());
 if ( rc != SSH_AUTH_SUCCESS )
 {
 QString err=ssh_get_error ( my_ssh_session );
 authErrors<

[X2Go-Commits] [x2goclient] 06/06: debian/changelog: syntax fixup.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 24db52c0ff238f801eb77b61a3a35bf3694a5d30
Author: Mihai Moldovan 
Date:   Fri Nov 10 23:09:05 2017 +0100

debian/changelog: syntax fixup.
---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 443b10b..8f3b86c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
   directly.
 
   [ Oleksandr Shneyder ]
-  * Change echo mode for user input in InteractionDialog.
+  * New upstream version (4.1.1.1):
+- Change echo mode for user input in InteractionDialog.
 
  -- X2Go Release Manager   Sun, 29 Oct 2017 11:44:44 +0100
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 04/06: src/onmainwindow.cpp: finally include version information in debug output.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 5bd460f299c6cb5bf27bdc67da80dee55b4c0293
Author: Mihai Moldovan 
Date:   Fri Nov 10 22:34:58 2017 +0100

src/onmainwindow.cpp: finally include version information in debug output.
---
 debian/changelog| 2 ++
 src/httpbrokerclient.cpp| 2 ++
 src/onmainwindow.cpp| 4 +++-
 src/sshmasterconnection.cpp | 3 +++
 src/sshmasterconnection.h   | 3 ++-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a04c84..4501d84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
   continues via challenge auth or plain passwords, but since users had no
   chance to input a password, such authentication will always fail. Give
   users a way to enter passwords, in case the auto-login failed.
+- src/onmainwindow.cpp: finally include version information in debug
+  output.
 
   [ Oleksandr Shneyder ]
   * Change echo mode for user input in InteractionDialog.
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 1540e98..96245f5 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -90,6 +90,8 @@ void HttpBrokerClient::createSshConnection()
config->brokerUser, 
config->brokerPass,config->brokerSshKey,config->brokerAutologin,
config->brokerKrbLogin, false);
 
+qRegisterMetaType 
("SshMasterConnection::passphrase_types");
+
 connect ( sshConnection, SIGNAL ( connectionOk(QString)), this, SLOT ( 
slotSshConnectionOk() ) );
 connect ( sshConnection, SIGNAL ( serverAuthError ( int,QString, 
SshMasterConnection* ) ),this,
   SLOT ( slotSshServerAuthError ( int,QString, 
SshMasterConnection* ) ) );
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index cd6cab5..bffb9ef 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -58,7 +58,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( 
parent )
 #ifdef Q_OS_LINUX
 image=shape=0;
 #endif
-x2goInfof(1) << tr("Starting X2Go Client...");
+x2goInfof(1) << tr("Starting X2Go Client %1...").arg (QString (VERSION));
 debugging = false;
 
 setFocusPolicy ( Qt::NoFocus );
@@ -2987,6 +2987,8 @@ SshMasterConnection* ONMainWindow::startSshConnection ( 
QString host, QString po
 else
 connect ( con, SIGNAL ( connectionOk(QString)), this, SLOT ( 
slotServSshConnectionOk(QString) ) );
 
+qRegisterMetaType 
("SshMasterConnection::passphrase_types");
+
 connect ( con, SIGNAL ( serverAuthError ( int,QString, 
SshMasterConnection* ) ),this,
   SLOT ( slotSshServerAuthError ( int,QString, 
SshMasterConnection* ) ) );
 connect ( con, SIGNAL ( needPassPhrase(SshMasterConnection*, 
SshMasterConnection::passphrase_types)),this,
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index fb0dee8..0cfb5d8 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -524,6 +524,9 @@ void SshMasterConnection::run()
 x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " << 
proxyport << "; proxylogin: " << proxylogin;
 sshProxy=new SshMasterConnection (0, proxyserver, 
proxyport,acceptUnknownServers,
   proxylogin, proxypassword, proxykey, 
proxyautologin, proxyKrbLogin, false);
+
+qRegisterMetaType 
("SshMasterConnection::passphrase_types");
+
 connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( 
slotSshProxyConnectionOk() ) );
 
 connect ( sshProxy, SIGNAL ( serverAuthError ( 
int,QString,SshMasterConnection* ) ),this,
diff --git a/src/sshmasterconnection.h b/src/sshmasterconnection.h
index 6f4a442..ad6776b 100644
--- a/src/sshmasterconnection.h
+++ b/src/sshmasterconnection.h
@@ -236,13 +236,14 @@ signals:
 
 void connectionOk( QString host);
 
-void needPassPhrase(SshMasterConnection*, passphrase_types);
+void needPassPhrase(SshMasterConnection*, 
SshMasterConnection::passphrase_types);
 void needChallengeResponse(SshMasterConnection*, QString Challenge);
 void startInteraction(SshMasterConnection*, QString prompt);
 void finishInteraction(SshMasterConnection*);
 void updateInteraction(SshMasterConnection*, QString output);
 };
 
+Q_DECLARE_METATYPE (SshMasterConnection::passphrase_types)
 
 #endif // SSHMASTERCONNECTION_H
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goclient] 01/06: src/sshmasterconnection.cpp: don't ask for private key passphrase if auto-login merely failed due to the server denying the public key.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit a7abd15be8be6bcd7d68b47deac3c3120b1ae9d4
Author: Mihai Moldovan 
Date:   Fri Nov 10 20:40:00 2017 +0100

src/sshmasterconnection.cpp: don't ask for private key passphrase if 
auto-login merely failed due to the server denying the public key.
---
 debian/changelog| 2 ++
 src/sshmasterconnection.cpp | 8 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9385408..91f6478 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: also bundle xauth binary as nxauth binary.
 - macbuild.sh: switch to bundling PulseAudio 11.1 since it's now available
   in MacPorts.
+- src/sshmasterconnection.cpp: don't ask for private key passphrase if
+  auto-login merely failed due to the server denying the public key.
 
   [ Oleksandr Shneyder ]
   * Change echo mode for user input in InteractionDialog.
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index d62485a..6ccf099 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1296,6 +1296,12 @@ bool SshMasterConnection::userAuthAuto()
 int i=0;
 while(rc != SSH_AUTH_SUCCESS)
 {
+if (SSH_AUTH_DENIED == rc) {
+  /* No need to continue, all keys have been rejected by the server. */
+  break;
+}
+
+/* This section should only be executed if rc is SSH_AUTH_ERROR. */
 keyPhraseReady=false;
 emit needPassPhrase(this, false);
 for(;;)
@@ -1323,7 +1329,7 @@ bool SshMasterConnection::userAuthAuto()
 QString err=ssh_get_error ( my_ssh_session );
 authErrors<

[X2Go-Commits] [x2goclient] 05/06: res/i18n/x2goclient_*.ts: apply last change to translation files directly.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 2b227974be577978f955a292d671b128f7dfe7cf
Author: Mihai Moldovan 
Date:   Fri Nov 10 22:43:32 2017 +0100

res/i18n/x2goclient_*.ts: apply last change to translation files directly.
---
 debian/changelog | 2 ++
 res/i18n/x2goclient_da.ts| 2 +-
 res/i18n/x2goclient_de.ts| 4 ++--
 res/i18n/x2goclient_es.ts| 4 ++--
 res/i18n/x2goclient_et.ts| 4 ++--
 res/i18n/x2goclient_fi.ts| 4 ++--
 res/i18n/x2goclient_fr.ts| 4 ++--
 res/i18n/x2goclient_nb_no.ts | 4 ++--
 res/i18n/x2goclient_nl.ts| 4 ++--
 res/i18n/x2goclient_pt.ts| 2 +-
 res/i18n/x2goclient_ru.ts| 2 +-
 res/i18n/x2goclient_sv.ts| 4 ++--
 res/i18n/x2goclient_tr.ts| 2 +-
 res/i18n/x2goclient_zh_tw.ts | 2 +-
 14 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4501d84..443b10b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
   users a way to enter passwords, in case the auto-login failed.
 - src/onmainwindow.cpp: finally include version information in debug
   output.
+- res/i18n/x2goclient_*.ts: apply last change to translation files
+  directly.
 
   [ Oleksandr Shneyder ]
   * Change echo mode for user input in InteractionDialog.
diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts
index 8b12e07..3fc9ec8 100644
--- a/res/i18n/x2goclient_da.ts
+++ b/res/i18n/x2goclient_da.ts
@@ -2433,7 +2433,7 @@ Venligst opdater til en nyere version af x2goserver 
pakken
 
 
 
-Starting X2Go Client...
+Starting X2Go Client %1...
 
 
 
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index daaa1f5..408a41d 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -2157,8 +2157,8 @@ Möchten Sie die Verbindung abbrechen?
 
 
 
-Starting X2Go Client...
-X2GoClient wird gestartet ...
+Starting X2Go Client %1...
+X2GoClient %1 wird gestartet ...
 
 
 
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index 11a6f5a..5582e93 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -2470,8 +2470,8 @@ Actualiza el paquete x2goserver en el 
servidor
 
 
 
-Starting X2Go Client...
-Iniciando cliente X2Go...
+Starting X2Go Client %1...
+Iniciando cliente X2Go %1...
 
 
 
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index c06a441..9770da4 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -1530,8 +1530,8 @@ Palun uuenda kasutamaks PulseAudio-t.
 
 
 
-Starting X2Go Client...
-X2Go Client käivitub...
+Starting X2Go Client %1...
+X2Go Client %1 käivitub...
 
 
 
diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts
index 3323180..7f2072d 100644
--- a/res/i18n/x2goclient_fi.ts
+++ b/res/i18n/x2goclient_fi.ts
@@ -1548,8 +1548,8 @@ Päivitä PulseAudioon.
 
 
 
-Starting X2Go Client...
-X2Go-yhteysohjelma käynnistyy...
+Starting X2Go Client %1...
+X2Go-yhteysohjelma %1 käynnistyy...
 
 
 
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index c0862df..0e10698 100644
--- a/res/i18n/x2goclient_fr.ts
+++ b/res/i18n/x2goclient_fr.ts
@@ -1770,8 +1770,8 @@ used for exporting folders and printers.
 utilisée pour exporter les dossiers et les imprimantes.
 
 
-Starting X2Go Client...
-Démarrage de X2Go Client...
+Starting X2Go Client %1...
+Démarrage de X2Go Client %1...
 
 
 Starting X2Go Client in portable mode. Data directory is: 

diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts
index 2a07a60..672bb0b 100644
--- a/res/i18n/x2goclient_nb_no.ts
+++ b/res/i18n/x2goclient_nb_no.ts
@@ -2234,8 +2234,8 @@ authoized_keys file.
 feil verdi til 
argumentet--clipboard
 
 
-Starting X2Go Client...
-Starter X2Go klienten...
+Starting X2Go Client %1...
+Starter X2Go klienten %1...
 
 
 Starting X2Go Client in portable mode. Data directory is: 

diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts
index 8277c40..85cefbb 100644
--- a/res/i18n/x2goclient_nl.ts
+++ b/res/i18n/x2goclient_nl.ts
@@ -1546,8 +1546,8 @@ A.u.b upgraden naar PulseAudio.
 
 
 
-Starting X2Go Client...
-X2Go Client wordt gestart...
+Starting X2Go Client %1...
+X2Go Client %1 wordt gestart...
 
 
 
diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts
index 7d4be3e..ae98b5d 100644
---

[X2Go-Commits] [x2goclient] 02/06: src/{httpbrokerclient, onmainwindow, sshmasterconnection}.{cpp, h}: introduce new passphrase_type enum and replace the old verificationCode boolean value with that.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit d8c10770678414652fe024fdc8a953b0649033d3
Author: Mihai Moldovan 
Date:   Fri Nov 10 21:23:45 2017 +0100

src/{httpbrokerclient,onmainwindow,sshmasterconnection}.{cpp,h}: introduce 
new passphrase_type enum and replace the old verificationCode boolean value 
with that.

Allows using more messages, including a new one for plain password
prompts.

Adapt usage accordingly.

The implementation is ugly, but there's no good way around that (short
of using C++11 features). The enum would really logically belong to
ONMainWindow, but since we also have to use it in SshMasterConnection,
that may not include onmainwindow.h to avoid a circular dependency, it
has to be part of SshMasterConnection for now.
---
 debian/changelog|  9 +++
 src/httpbrokerclient.cpp| 54 ---
 src/httpbrokerclient.h  |  2 +-
 src/onmainwindow.cpp| 61 +
 src/onmainwindow.h  |  2 +-
 src/sshmasterconnection.cpp | 10 
 src/sshmasterconnection.h   | 10 +++-
 7 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91f6478..13568ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,15 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
   in MacPorts.
 - src/sshmasterconnection.cpp: don't ask for private key passphrase if
   auto-login merely failed due to the server denying the public key.
+- src/{httpbrokerclient,onmainwindow,sshmasterconnection}.{cpp,h}:
+  introduce new passphrase_type enum and replace the old verificationCode
+  boolean value with that. Allows using more messages, including a new one
+  for plain password prompts. Adapt usage accordingly. The implementation
+  is ugly, but there's no good way around that (short of using C++11
+  features). The enum would really logically belong to ONMainWindow, but
+  since we also have to use it in SshMasterConnection, that may not
+  include onmainwindow.h to avoid a circular dependency, it has to be
+  part of SshMasterConnection for now.
 
   [ Oleksandr Shneyder ]
   * Change echo mode for user input in InteractionDialog.
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 7cc1403..1540e98 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -93,8 +93,8 @@ void HttpBrokerClient::createSshConnection()
 connect ( sshConnection, SIGNAL ( connectionOk(QString)), this, SLOT ( 
slotSshConnectionOk() ) );
 connect ( sshConnection, SIGNAL ( serverAuthError ( int,QString, 
SshMasterConnection* ) ),this,
   SLOT ( slotSshServerAuthError ( int,QString, 
SshMasterConnection* ) ) );
-connect ( sshConnection, SIGNAL ( needPassPhrase(SshMasterConnection*, 
bool)),this,
-  SLOT ( slotSshServerAuthPassphrase(SshMasterConnection*, bool)) 
);
+connect ( sshConnection, SIGNAL ( needPassPhrase(SshMasterConnection*, 
SshMasterConnection::passphrase_types)),this,
+  SLOT ( slotSshServerAuthPassphrase(SshMasterConnection*, 
SshMasterConnection::passphrase_types)) );
 connect ( sshConnection, SIGNAL ( userAuthError ( QString ) ),this,SLOT ( 
slotSshUserAuthError ( QString ) ) );
 connect ( sshConnection, SIGNAL ( connectionError(QString,QString)), this,
   SLOT ( slotSshConnectionError ( QString,QString ) ) );
@@ -209,34 +209,38 @@ void HttpBrokerClient::slotSshServerAuthError(int error, 
QString sshMessage, Ssh
 
 }
 
-void HttpBrokerClient::slotSshServerAuthPassphrase(SshMasterConnection* 
connection, bool verificationCode)
+void HttpBrokerClient::slotSshServerAuthPassphrase(SshMasterConnection* 
connection, SshMasterConnection::passphrase_types passphrase_type)
 {
 bool ok;
 QString message;
 
-if(verificationCode)
-{
-message=tr("Verification code:");
-}
-else
-{
-message=tr("Enter passphrase to decrypt a key");
-}
-
-
-QString 
phrase=QInputDialog::getText(0,connection->getUser()+"@"+connection->getHost()+":"+QString::number(connection->getPort()),
- message, 
QLineEdit::Password,QString::null, );
-if(!ok)
-{
-phrase=QString::null;
-}
-else
-{
-if(phrase==QString::null)
-phrase="";
+switch (passphrase_type) {
+case SshMasterConnection::PASSPHRASE_PRIVKEY:
+message = tr ("Enter 
passphrase to decrypt a key");
+ok = true;
+break;
+case SshMasterConnection::PASSPHRASE_CHALLENGE:
+

[X2Go-Commits] [x2goclient] branch master updated (2bf33e8 -> 24db52c)

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goclient.

  from  2bf33e8   Change echo mode for user input in InteractionDialog.
   new  a7abd15   src/sshmasterconnection.cpp: don't ask for private key 
passphrase if auto-login merely failed due to the server denying the public key.
   new  d8c1077   
src/{httpbrokerclient,onmainwindow,sshmasterconnection}.{cpp,h}: introduce new 
passphrase_type enum and replace the old verificationCode boolean value with 
that.
   new  d0be65e   src/sshmasterconnection.cpp: query for password if it 
wasn't already provided.
   new  5bd460f   src/onmainwindow.cpp: finally include version information 
in debug output.
   new  2b22797   res/i18n/x2goclient_*.ts: apply last change to 
translation files directly.
   new  24db52c   debian/changelog: syntax fixup.

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 24 +-
 res/i18n/x2goclient_da.ts|  2 +-
 res/i18n/x2goclient_de.ts|  4 +--
 res/i18n/x2goclient_es.ts|  4 +--
 res/i18n/x2goclient_et.ts|  4 +--
 res/i18n/x2goclient_fi.ts|  4 +--
 res/i18n/x2goclient_fr.ts|  4 +--
 res/i18n/x2goclient_nb_no.ts |  4 +--
 res/i18n/x2goclient_nl.ts|  4 +--
 res/i18n/x2goclient_pt.ts|  2 +-
 res/i18n/x2goclient_ru.ts|  2 +-
 res/i18n/x2goclient_sv.ts|  4 +--
 res/i18n/x2goclient_tr.ts|  2 +-
 res/i18n/x2goclient_zh_tw.ts |  2 +-
 src/httpbrokerclient.cpp | 56 +---
 src/httpbrokerclient.h   |  2 +-
 src/onmainwindow.cpp | 65 +
 src/onmainwindow.h   |  2 +-
 src/sshmasterconnection.cpp  | 76 +---
 src/sshmasterconnection.h| 11 ++-
 20 files changed, 174 insertions(+), 104 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] branch master updated (e25467a -> 54d2c27)

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository x2goserver.

  from  e25467a   debian/changelog: sync with release/4.0.1.x branch.
   new  54d2c27   x2goserver/bin/x2go{resume-session,startagent}: use the 
actual system's host name instead of the short name only.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |  9 -
 x2goserver/bin/x2goresume-session | 12 
 x2goserver/bin/x2gostartagent | 12 
 3 files changed, 16 insertions(+), 17 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] branch release/4.0.1.x updated (8960e93 -> 0e4ed49)

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch release/4.0.1.x
in repository x2goserver.

  from  8960e93   Continue development
   new  0e4ed49   x2goserver/bin/x2go{resume-session,startagent}: use the 
actual system's host name instead of the short name only.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |  9 -
 x2goserver/bin/x2goresume-session | 12 
 x2goserver/bin/x2gostartagent | 12 
 3 files changed, 16 insertions(+), 17 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 01/01: x2goserver/bin/x2go{resume-session, startagent}: use the actual system's host name instead of the short name only.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 54d2c272f550c4f519578b8fccdda142a13499a9
Author: Mihai Moldovan 
Date:   Fri Nov 10 20:32:28 2017 +0100

x2goserver/bin/x2go{resume-session,startagent}: use the actual system's 
host name instead of the short name only.

Fixes startup issues on a wide variety of systems that use a FQDN as their 
host name.

In such a scenario, using the short name works iff the short name maps
to 127.0.0.1. Otherwise, session startups fail.

Using the actual host name does not require such hacks, so use this instead.

Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog  |  9 -
 x2goserver/bin/x2goresume-session | 12 
 x2goserver/bin/x2gostartagent | 12 
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61dfa1b..69bc6e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -248,7 +248,14 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
 
 x2goserver (4.0.1.22-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Mihai Moldovan ]
+  * New upstream version (4.0.1.22):
+- x2goserver/bin/x2go{resume-session,startagent}: use the actual system's
+  host name instead of the short name only. Fixes startup issues on a wide
+  variety of systems that use a FQDN as their host name. In such a
+  scenario, using the short name works iff the short name maps to
+  127.0.0.1. Otherwise, session startups fail. Using the actual host name
+  does not require such hacks, so use this instead.
 
  -- X2Go Release Manager   Wed, 08 Nov 2017 15:26:05 +0100
 
diff --git a/x2goserver/bin/x2goresume-session 
b/x2goserver/bin/x2goresume-session
index 3ff8bdd..e959052 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -52,16 +52,12 @@ X2GO_FULLSCREEN=0
 #   - export HOSTNAME="malbox"; x2gostartagent will override the actual system
 # host name and lead to authorization failures when connecting to
 # x2goagent/nxagent later on.
-#   - even if the above is not the case, the value returned by gethostname(2)
-# could either be a FQDN, the short name or anything in between. glibc
-# seems to return the short name on Linux, since it calls uname(2), which
-# typically does not include a domain, but *BSD seems to default to
-# the FQDN. We explicitly need the short name.
+#   - even if the above is not the case, we want to be sure to get the actual
+# system host name.
 #
-# Workaround: use hostname -s, which luckily is portable enough to be available
-# on a wide variety of systems.
+# Workaround: use hostname.
 typeset current_host_name=""
-current_host_name="$(hostname -s)"
+current_host_name="$(hostname)"
 
 if [[ "${?}" -ne "0" ]]; then
typeset msg="Unable to retrieve machine's hostname. This is required. 
Aborting session startup."
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index e0a4a45..28b70d6 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -126,16 +126,12 @@ fi
 #   - export HOSTNAME="malbox"; x2gostartagent will override the actual system
 # host name and lead to authorization failures when connecting to
 # x2goagent/nxagent later on.
-#   - even if the above is not the case, the value returned by gethostname(2)
-# could either be a FQDN, the short name or anything in between. glibc
-# seems to return the short name on Linux, since it calls uname(2), which
-# typically does not include a domain, but *BSD seems to default to
-# the FQDN. We explicitly need the short name.
+#   - even if the above is not the case, we want to be sure to get the actual
+# system host name.
 #
-# Workaround: use hostname -s, which luckily is portable enough to be available
-# on a wide variety of systems.
+# Workaround: use hostname.
 typeset current_host_name=""
-current_host_name="$(hostname -s)"
+current_host_name="$(hostname)"
 
 if [[ "${?}" -ne "0" ]]; then
typeset msg="Unable to retrieve machine's hostname. This is required. 
Aborting session startup."

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

[X2Go-Commits] [x2goserver] 01/01: x2goserver/bin/x2go{resume-session, startagent}: use the actual system's host name instead of the short name only.

2017-11-10 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 0e4ed49669c8eaaf88b9692c76d5e081b0633a82
Author: Mihai Moldovan 
Date:   Fri Nov 10 20:32:28 2017 +0100

x2goserver/bin/x2go{resume-session,startagent}: use the actual system's 
host name instead of the short name only.

Fixes startup issues on a wide variety of systems that use a FQDN as their 
host name.

In such a scenario, using the short name works iff the short name maps
to 127.0.0.1. Otherwise, session startups fail.

Using the actual host name does not require such hacks, so use this instead.
---
 debian/changelog  |  9 -
 x2goserver/bin/x2goresume-session | 12 
 x2goserver/bin/x2gostartagent | 12 
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0459e32..3e04c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 x2goserver (4.0.1.22-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development
+  [ Mihai Moldovan ]
+  * New upstream version (4.0.1.22):
+- x2goserver/bin/x2go{resume-session,startagent}: use the actual system's
+  host name instead of the short name only. Fixes startup issues on a wide
+  variety of systems that use a FQDN as their host name. In such a
+  scenario, using the short name works iff the short name maps to
+  127.0.0.1. Otherwise, session startups fail. Using the actual host name
+  does not require such hacks, so use this instead.
 
  -- X2Go Release Manager   Wed, 08 Nov 2017 15:26:05 +0100
 
diff --git a/x2goserver/bin/x2goresume-session 
b/x2goserver/bin/x2goresume-session
index c981a7d..c1fbab0 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -51,16 +51,12 @@ X2GO_FULLSCREEN=0
 #   - export HOSTNAME="malbox"; x2gostartagent will override the actual system
 # host name and lead to authorization failures when connecting to
 # x2goagent/nxagent later on.
-#   - even if the above is not the case, the value returned by gethostname(2)
-# could either be a FQDN, the short name or anything in between. glibc
-# seems to return the short name on Linux, since it calls uname(2), which
-# typically does not include a domain, but *BSD seems to default to
-# the FQDN. We explicitly need the short name.
+#   - even if the above is not the case, we want to be sure to get the actual
+# system host name.
 #
-# Workaround: use hostname -s, which luckily is portable enough to be available
-# on a wide variety of systems.
+# Workaround: use hostname.
 typeset current_host_name=""
-current_host_name="$(hostname -s)"
+current_host_name="$(hostname)"
 
 if [[ "${?}" -ne "0" ]]; then
typeset msg="Unable to retrieve machine's hostname. This is required. 
Aborting session startup."
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 8708799..40bc6c0 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -126,16 +126,12 @@ fi
 #   - export HOSTNAME="malbox"; x2gostartagent will override the actual system
 # host name and lead to authorization failures when connecting to
 # x2goagent/nxagent later on.
-#   - even if the above is not the case, the value returned by gethostname(2)
-# could either be a FQDN, the short name or anything in between. glibc
-# seems to return the short name on Linux, since it calls uname(2), which
-# typically does not include a domain, but *BSD seems to default to
-# the FQDN. We explicitly need the short name.
+#   - even if the above is not the case, we want to be sure to get the actual
+# system host name.
 #
-# Workaround: use hostname -s, which luckily is portable enough to be available
-# on a wide variety of systems.
+# Workaround: use hostname.
 typeset current_host_name=""
-current_host_name="$(hostname -s)"
+current_host_name="$(hostname)"
 
 if [[ "${?}" -ne "0" ]]; then
typeset msg="Unable to retrieve machine's hostname. This is required. 
Aborting session startup."

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goserver.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits