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
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 <ionic@ionic.de> 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<<err; #ifdef DEBUG - x2goDebug<<"userAuthAuto failed:" <<err<<endl; + x2goDebug << "userAuthAuto failed:" << err << " (code " << rc << ")" << endl; #endif return false; } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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 <ionic@ionic.de> 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, &ok); - 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: + message = tr ("Verification code:"); + ok = true; + break; + case SshMasterConnection::PASSPHRASE_PASSWORD: + message = tr ("Enter user account password:"); + ok = true; + break; + default: + x2goDebug << "Unknown passphrase type requested! Was: " << passphrase_type << endl; + ok = false; + break; + } + + if (ok) { + QString phrase = QInputDialog::getText (0, connection->getUser () + "@" + connection->getHost () + ":" + QString::number (connection->getPort ()), + message, QLineEdit::Password, QString (""), &ok); + if (!ok) { + phrase = QString (""); + } + connection->setKeyPhrase (phrase); } - connection->setKeyPhrase(phrase); - } void HttpBrokerClient::closeSSHInteractionDialog() diff --git a/src/httpbrokerclient.h b/src/httpbrokerclient.h index f654954..1b62b26 100644 --- a/src/httpbrokerclient.h +++ b/src/httpbrokerclient.h @@ -72,7 +72,7 @@ private slots: QString getHexVal ( const QByteArray& ba ); void slotSshConnectionError ( QString message, QString lastSessionError ); void slotSshServerAuthError ( int error, QString sshMessage, SshMasterConnection* connection ); - void slotSshServerAuthPassphrase ( SshMasterConnection* connection, bool verificationCode=false ); + void slotSshServerAuthPassphrase ( SshMasterConnection* connection, SshMasterConnection::passphrase_types passphrase_type = SshMasterConnection::PASSPHRASE_PRIVKEY ); void slotSshUserAuthError ( QString error ); void slotSshConnectionOk(); void slotListSessions ( bool success, QString answer, int pid); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index b4b8f28..cd6cab5 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2989,8 +2989,8 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po connect ( con, SIGNAL ( serverAuthError ( int,QString, SshMasterConnection* ) ),this, SLOT ( slotSshServerAuthError ( int,QString, SshMasterConnection* ) ) ); - connect ( con, SIGNAL ( needPassPhrase(SshMasterConnection*, bool)),this, - SLOT ( slotSshServerAuthPassphrase(SshMasterConnection*, bool)) ); + connect ( con, SIGNAL ( needPassPhrase(SshMasterConnection*, SshMasterConnection::passphrase_types)),this, + SLOT ( slotSshServerAuthPassphrase(SshMasterConnection*, SshMasterConnection::passphrase_types)) ); connect ( con, SIGNAL ( needChallengeResponse(SshMasterConnection*, QString)),this, SLOT ( slotSshServerAuthChallengeResponse(SshMasterConnection*, QString)) ); connect ( con, SIGNAL ( userAuthError ( QString ) ),this,SLOT ( slotSshUserAuthError ( QString ) ) ); @@ -3160,34 +3160,41 @@ void ONMainWindow::slotSshInteractionUpdate(SshMasterConnection* connection, QSt x2goDebug<<"SSH Interaction update:"<<output; } -void ONMainWindow::slotSshServerAuthPassphrase(SshMasterConnection* connection, bool verificationCode) +void ONMainWindow::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, &ok); - if(!ok) - { - phrase=QString::null; - } - else - { - if(phrase==QString::null) - phrase=""; - } - connection->setKeyPhrase(phrase); - if(isHidden()) - { - show(); - QTimer::singleShot(1, this, SLOT(hide())); + + switch (passphrase_type) { + case SshMasterConnection::PASSPHRASE_PRIVKEY: + message = tr ("Enter passphrase to decrypt a key"); + ok = true; + break; + case SshMasterConnection::PASSPHRASE_CHALLENGE: + message = tr ("Verification code:"); + ok = true; + break; + case SshMasterConnection::PASSPHRASE_PASSWORD: + message = tr ("Enter user account password:"); + ok = true; + break; + default: + x2goDebug << "Unknown passphrase type requested! Was: " << passphrase_type << endl; + ok = false; + break; + } + + if (ok) { + QString phrase = QInputDialog::getText (0, connection->getUser () + "@" + connection->getHost () + ":" + QString::number (connection->getPort ()), + message, QLineEdit::Password, QString (""), &ok); + if (!ok) { + phrase = QString (""); + } + connection->setKeyPhrase (phrase); + if(isHidden ()) { + show (); + QTimer::singleShot (1, this, SLOT (hide ())); + } } } diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 5d3d728..0a115bb 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -1045,7 +1045,7 @@ private slots: void showSessionStatus(); void slotSshConnectionError ( QString message, QString lastSessionError ); void slotSshServerAuthError ( int error, QString sshMessage, SshMasterConnection* connection ); - void slotSshServerAuthPassphrase ( SshMasterConnection* connection, bool verificationCode ); + void slotSshServerAuthPassphrase ( SshMasterConnection* connection, SshMasterConnection::passphrase_types passphrase_type ); void slotSshInteractionStart ( SshMasterConnection* connection, QString prompt ); void slotSshInteractionUpdate ( SshMasterConnection* connection, QString output ); void slotSshInteractionFinish ( SshMasterConnection* connection); diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 6ccf099..7831265 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -528,8 +528,8 @@ void SshMasterConnection::run() connect ( sshProxy, SIGNAL ( serverAuthError ( int,QString,SshMasterConnection* ) ),this, SLOT ( slotSshProxyServerAuthError ( int,QString, SshMasterConnection* ) ) ); - connect ( sshProxy, SIGNAL ( needPassPhrase(SshMasterConnection*, bool)),this, - SIGNAL ( needPassPhrase(SshMasterConnection*, bool)) ); + connect ( sshProxy, SIGNAL ( needPassPhrase(SshMasterConnection*, SshMasterConnection::passphrase_types)),this, + SIGNAL ( needPassPhrase(SshMasterConnection*, SshMasterConnection::passphrase_types)) ); connect ( sshProxy, SIGNAL ( serverAuthAborted()),this, SLOT ( slotSshProxyServerAuthAborted()) ); connect ( sshProxy, SIGNAL ( userAuthError ( QString ) ),this,SLOT ( slotSshProxyUserAuthError ( QString ) ) ); @@ -1180,7 +1180,7 @@ bool SshMasterConnection::userChallengeAuth() if (need_to_display_auth_code_prompt) { emit needChallengeResponse(this, pr); } else { - emit needPassPhrase(this, true); + emit needPassPhrase(this, PASSPHRASE_CHALLENGE); } for(;;) { @@ -1303,7 +1303,7 @@ bool SshMasterConnection::userAuthAuto() /* This section should only be executed if rc is SSH_AUTH_ERROR. */ keyPhraseReady=false; - emit needPassPhrase(this, false); + emit needPassPhrase(this, PASSPHRASE_PRIVKEY); for(;;) { bool ready=false; @@ -1413,7 +1413,7 @@ bool SshMasterConnection::userAuthWithKey() #endif { keyPhraseReady=false; - emit needPassPhrase(this, false); + emit needPassPhrase(this, PASSPHRASE_PRIVKEY); for(;;) { bool ready=false; diff --git a/src/sshmasterconnection.h b/src/sshmasterconnection.h index e6924e0..6f4a442 100644 --- a/src/sshmasterconnection.h +++ b/src/sshmasterconnection.h @@ -74,6 +74,14 @@ class SshMasterConnection: public QThread PROPERTY(bool, kerberosDelegation) public: enum ProxyType {PROXYSSH, PROXYHTTP}; + + enum passphrase_types { + PASSPHRASE_PRIVKEY, + PASSPHRASE_CHALLENGE, + PASSPHRASE_PASSWORD, + PASSPHRASE_UNKNOWN + }; + void run(); SshMasterConnection(QObject* parent, QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key, bool autologin, bool krblogin=false, @@ -228,7 +236,7 @@ signals: void connectionOk( QString host); - void needPassPhrase(SshMasterConnection*, bool verificationCode); + void needPassPhrase(SshMasterConnection*, passphrase_types); void needChallengeResponse(SshMasterConnection*, QString Challenge); void startInteraction(SshMasterConnection*, QString prompt); void finishInteraction(SshMasterConnection*); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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 <ionic@ionic.de> 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."<<endl; -#endif - challengeAuthPasswordAccepted=false; - ret = userChallengeAuth(); + if (method & SSH_AUTH_METHOD_INTERACTIVE) { + x2goDebug << "Challenge authentication requested." << endl; + + challengeAuthPasswordAccepted = false; + ret = userChallengeAuth (); + + if (!ret) { + x2goDebug << "Challenge authentication failed." << endl; + } } if (!ret) { - x2goDebug << "Challenge authentication failed. Trying password mechanism if available." << endl; + x2goDebug << "Trying password mechanism if available." << endl; } - if ((!ret) && (method & SSH_AUTH_METHOD_PASSWORD)) - { - if (!ret) { - x2goDebug << "Password mechanism available. Continuing." << endl; - } + if ((!ret) && (method & SSH_AUTH_METHOD_PASSWORD)) { + x2goDebug << "Password mechanism available. Continuing." << endl; -#ifdef DEBUG - x2goDebug<<"Password authentication requested."<<endl; -#endif - int rc = ssh_userauth_password ( my_ssh_session, NULL, pass.toLatin1() ); + QString auth_password = pass; + + if (auth_password.isEmpty ()) { + keyPhraseReady = false; + emit needPassPhrase (this, PASSPHRASE_PASSWORD); + + for (bool ready = false; !ready;) { + this->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<<err; -#ifdef DEBUG - x2goDebug<<"userAuthWithPass failed:" <<err<<endl; -#endif + x2goDebug << "Password authentication failed: " << err << endl; } else { ret = true; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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 <ionic@ionic.de> 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> ("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> ("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> ("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
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 <ionic@ionic.de> 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</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> + <source>Starting X2Go Client %1...</source> <translation type="unfinished"></translation> </message> <message> 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?</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> - <translation>X2GoClient wird gestartet ...</translation> + <source>Starting X2Go Client %1...</source> + <translation>X2GoClient %1 wird gestartet ...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="286"/> 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</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> - <translation>Iniciando cliente X2Go...</translation> + <source>Starting X2Go Client %1...</source> + <translation>Iniciando cliente X2Go %1...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="286"/> 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.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> - <translation>X2Go Client käivitub...</translation> + <source>Starting X2Go Client %1...</source> + <translation>X2Go Client %1 käivitub...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="286"/> 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.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> - <translation>X2Go-yhteysohjelma käynnistyy...</translation> + <source>Starting X2Go Client %1...</source> + <translation>X2Go-yhteysohjelma %1 käynnistyy...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="286"/> 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.</source> utilisée pour exporter les dossiers et les imprimantes.</translation> </message> <message> - <source>Starting X2Go Client...</source> - <translation>Démarrage de X2Go Client...</translation> + <source>Starting X2Go Client %1...</source> + <translation>Démarrage de X2Go Client %1...</translation> </message> <message> <source>Starting X2Go Client in portable mode. Data directory is: </source> 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.</source> <translation type="obsolete">feil verdi til argumentet"--clipboard"</translation> </message> <message> - <source>Starting X2Go Client...</source> - <translation>Starter X2Go klienten...</translation> + <source>Starting X2Go Client %1...</source> + <translation>Starter X2Go klienten %1...</translation> </message> <message> <source>Starting X2Go Client in portable mode. Data directory is: </source> 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.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> - <translation>X2Go Client wordt gestart...</translation> + <source>Starting X2Go Client %1...</source> + <translation>X2Go Client %1 wordt gestart...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="286"/> diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts index 7d4be3e..ae98b5d 100644 --- a/res/i18n/x2goclient_pt.ts +++ b/res/i18n/x2goclient_pt.ts @@ -1369,7 +1369,7 @@ Please upgrade to PulseAudio.</source> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> + <source>Starting X2Go Client %1...</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts index 2803a09..3897806 100644 --- a/res/i18n/x2goclient_ru.ts +++ b/res/i18n/x2goclient_ru.ts @@ -2814,7 +2814,7 @@ Please check your settings</source> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> + <source>Starting X2Go Client %1...</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts index 871a883..2b3788c 100644 --- a/res/i18n/x2goclient_sv.ts +++ b/res/i18n/x2goclient_sv.ts @@ -1559,8 +1559,8 @@ Var vänlig uppgradera till PulseAudio.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> - <translation>Startar X2Go-klient...</translation> + <source>Starting X2Go Client %1...</source> + <translation>Startar X2Go-klient %1...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="286"/> diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts index f0ef6bd..0732d43 100644 --- a/res/i18n/x2goclient_tr.ts +++ b/res/i18n/x2goclient_tr.ts @@ -1547,7 +1547,7 @@ Please upgrade to PulseAudio.</source> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> + <source>Starting X2Go Client %1...</source> <translation type="unfinished"></translation> </message> <message> diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts index 34d050b..f820f01 100644 --- a/res/i18n/x2goclient_zh_tw.ts +++ b/res/i18n/x2goclient_zh_tw.ts @@ -2320,7 +2320,7 @@ Please update to a newer x2goserver package</source> </message> <message> <location filename="../../src/onmainwindow.cpp" line="61"/> - <source>Starting X2Go Client...</source> + <source>Starting X2Go Client %1...</source> <translation type="unfinished"></translation> </message> <message> -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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 <ionic@ionic.de> 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 <git-admin@x2go.org> 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
-
git-admin＠x2go.org