This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. from ef033df onmainwindow.cpp: wait 3 seconds before checking sshd startup state to allow it to come up. new 2c0687a onmainwindow.cpp: adapt SSH host key warning message to new usermode sshd possibilities. 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 | 2 ++ src/onmainwindow.cpp | 75 +++++++++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 32 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 bugfix/osx in repository x2goclient. commit 2c0687ac3906a3fe1f1a42262029809f096151b5 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 13 01:18:10 2015 +0100 onmainwindow.cpp: adapt SSH host key warning message to new usermode sshd possibilities. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 75 +++++++++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d34be6..069b173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -235,6 +235,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low server config. - onmainwindow.cpp: wait 3 seconds before checking sshd startup state to allow it to come up. + - onmainwindow.cpp: adapt SSH host key warning message to new usermode + sshd possibilities. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index d1f3076..73b8dfd 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -11477,50 +11477,61 @@ void ONMainWindow::printSshDError_noHostPubKey() if ( closeEventSent ) return; - X2goSettings st ("settings"); - int port = clientSshPort.toInt (); - Non_Modal_MessageBox::critical (0l, "X2Go Client", - tr ("SSH daemon failed to open its public host key."), - tr ("You have enabled Remote Printing or File Sharing.\n" - "These features require a running and functioning SSH server on your computer.\n" - "<b>Printing and File Sharing will be disabled for this session.</b>\n\n" + QString error_message = tr ("SSH daemon failed to open its public host key."); - "The SSH server is currently not configured correctly.\n\n" + QString detailed_error_message = tr ("You have enabled Remote Printing or File Sharing.\n" + "These features require a running and functioning SSH server on your computer.\n" + "<b>Printing and File Sharing will be disabled for this session.</b>\n\n" + + "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 exists.\n\n"); #ifdef Q_OS_WIN - "Normally, this should not happen as X2Go Client for Windows " - "ships its own internal SSH server and automatically " - "generates the required keys.\n\n" - - "If you see this message, please report a bug on:\n" - "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" - "https://wiki.x2go.org/doku.php/wiki:bugs" - "</a></center>\n" + detailed_error_message += tr ("Normally, this should not happen as X2Go Client for Windows " + "ships its own internal SSH server and automatically " + "generates the required keys.\n\n" + + "If you see this message, please report a bug on:\n" + "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" + "https://wiki.x2go.org/doku.php/wiki:bugs" + "</a></center>\n"); #else // defined (Q_OS_WIN) + if (userSshd) { + detailed_error_message += tr ("X2Go Client was unable to create SSH host keys.\n\n" + + "Please report a bug on:\n" + "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" + "https://wiki.x2go.org/doku.php/wiki:bugs" + "</a></center>\n"); + } + else { #ifdef Q_OS_DARWIN - "On OS X, please follow these steps to generate the " - "required keys:" - - "<ul>" - "<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>" - "<li>Run this command: <b>ssh -p " + QString::number (port).toAscii () - + " localhost</b></li>" - "<li>You do not need to login. Just quit the Terminal application " - "via Cmd + Q</li>" - "</ul>" + detailed_error_message += tr ("On OS X, please follow these steps to generate the " + "required keys:" + + "<ul>" + "<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>" + "<li>Run this command: <b>ssh -p " + QString::number (port).toAscii () + + " localhost</b></li>" + "<li>You do not need to login. Just quit the Terminal application " + "via Cmd + Q</li>" + "</ul>"); #else // defined (Q_OS_DARWIN) - "Please ask your system administrator to generate the required host keys.\n\n" + detailed_error_message += tr ("Please ask your system administrator to generate the required host keys.\n\n" - "If you are administrating this system yourself, please run:\n" + "If you are administrating this system yourself, please run:\n" - "<center><b>sudo ssh-keygen -A</b></center>\n\n" + "<center><b>sudo ssh-keygen -A</b></center>\n\n"); #endif // defined (Q_OS_DARWIN) + } #endif // defined (Q_OS_WIN) - "Disabling Remote Printing or File Sharing support " - "in the session settings will get rid of this message."), + + detailed_error_message += tr ("Disabling Remote Printing or File Sharing support " + "in the session settings will get rid of this message."); + + Non_Modal_MessageBox::critical (0l, "X2Go Client", error_message, detailed_error_message, true, QMessageBox::Ok, QMessageBox::NoButton); } -- 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