This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 70cad6a src/sessionbutton.cpp: replace drop down menu button on session buttons with a more prominent, bigger settings gear icon. new 41a6398 src/onmainwindow.cpp: add debug statements to createRSAKey () regarding the host pub key locations on OS X. new f5f0872 src/onmainwindow.cpp: fix error message string in printSshDError_noHostPubKey (). The 2 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 | 4 ++++ src/onmainwindow.cpp | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) -- 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 41a6398f3736ec76b2f3cda9e7282dff57789898 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Sep 22 04:27:23 2016 +0200 src/onmainwindow.cpp: add debug statements to createRSAKey () regarding the host pub key locations on OS X. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ed3e891..3fc9fc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium - src/sessionbutton.cpp: replace drop down menu button on session buttons with a more prominent, bigger settings gear icon. Requested for visibility. + - src/onmainwindow.cpp: add debug statements to createRSAKey () regarding + the host pub key locations on OS X. -- X2Go Release Manager <git-admin@x2go.org> Mon, 19 Sep 2016 09:07:07 +0200 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 1042b58..1e645d8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -8063,9 +8063,13 @@ QString ONMainWindow::createRSAKey() /* OS X 10.11+ changed the key location to /etc/ssh/. */ QFileInfo rsa_host_key ("/etc/ssh/ssh_host_rsa_key.pub"); + x2goDebug << "first try for RSA key " << rsa_host_key.absoluteFilePath () << ": " + << rsa_host_key.exists (); if (!(rsa_host_key.exists ())) { rsa_host_key = QFileInfo ("/etc/ssh_host_rsa_key.pub"); + x2goDebug << "second try for RSA key " << rsa_host_key.absoluteFilePath () << ": " + << rsa_host_key.exists (); if (!(rsa_host_key.exists ())) { printSshDError_noHostPubKey (); return QString::null; -- 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 f5f0872ecc1c70c663d904feef79b2805cf6ab82 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Sep 22 04:28:27 2016 +0200 src/onmainwindow.cpp: fix error message string in printSshDError_noHostPubKey (). --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3fc9fc1..c6140de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium visibility. - src/onmainwindow.cpp: add debug statements to createRSAKey () regarding the host pub key locations on OS X. + - src/onmainwindow.cpp: fix error message string in + printSshDError_noHostPubKey (). -- X2Go Release Manager <git-admin@x2go.org> Mon, 19 Sep 2016 09:07:07 +0200 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 1e645d8..4b3fb05 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12020,7 +12020,7 @@ void ONMainWindow::printSshDError_noHostPubKey() "The SSH server is currently not configured correctly.\n\n" - "Please ensure that the server's public exists.\n\n"); + "Please ensure that the server's public key exists.\n\n"); #ifdef Q_OS_WIN detailed_error_message += tr ("Normally, this should not happen as X2Go Client for Windows " "ships its own internal SSH server and automatically " -- 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