This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 7d15adb9d21cb2c35fcd31e3787641a40a69aaa1 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Dec 9 16:51:47 2016 +0100 src/onmainwindow.cpp: move generateEtcFiles () call to startSshd (). We must make sure that the sshd_config file exists and is up-to-date, so let's always do it right before starting the sshd binary. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d99cb6a..430eca8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -476,6 +476,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium - src/pulsemanager.cpp: fix PA binary searching logic. We don't want to unconditionally set system_pulse_ to true if we found a binary... it might as well be the bundled one... + - src/onmainwindow.cpp: move generateEtcFiles () call to startSshd (). We + must make sure that the sshd_config file exists and is up-to-date, so + let's always do it right before starting the sshd binary. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 8748d21..e367a4d 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -9994,7 +9994,6 @@ void ONMainWindow::startWinServers(ONMainWindow::key_types key_type) dr.mkpath ( etcDir ); UNUSED (generateKey (key_type, true)); sshStarter->set_ssh_key_type (key_type); - generateEtcFiles(); sshStarter->start(); } @@ -10484,7 +10483,6 @@ QString ONMainWindow::createKeyBundle (key_types key_type) { #ifdef Q_OS_UNIX x2goDebug << "Creating a new one."; QString tmp_file_name (generateKey (key_type, true)); - generateEtcFiles (); rsa.setFileName (tmp_file_name + ".pub"); if (!(rsa.open (QIODevice::ReadOnly | QIODevice::Text))) { @@ -10552,6 +10550,12 @@ bool ONMainWindow::startSshd(ONMainWindow::key_types key_type) } } + /* + * Pro-actively (re-)create sshd_config file, we'll need it for sshd + * and more importantly make sure that it's up-to-date. + */ + generateEtcFiles (); + clientSshPort = "7022"; QString etcDir=homeDir+"/.x2go/etc"; int port=clientSshPort.toInt(); -- 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 6c1c6ebb3082117d618a6583656f613cd9c5bf74 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Dec 9 16:54:33 2016 +0100 src/{onmainwindow,pulsemanager}.cpp: actually *use* what we got back from add_to_path ()... Fixes a few bugs here and there. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- src/pulsemanager.cpp | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49cb673..9e79c6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -481,6 +481,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium let's always do it right before starting the sshd binary. - src/onmainwindow.cpp: stop duplicating the list of known sftp-server binary locations. + - src/{onmainwindow,pulsemanager}.cpp: actually *use* what we got back + from add_to_path ()... Fixes a few bugs here and there. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 9e79ee0..b39ca9a 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10174,7 +10174,7 @@ void ONMainWindow::generateEtcFiles() QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment (); QString path_val = tmp_env.value ("PATH"); - add_to_path (path_val, common_sftp_dirs); + path_val = add_to_path (path_val, common_sftp_dirs); /* Just in case we bundle sftp-server ourselves. */ sftp_binary = find_binary (appDir, "sftp-server"); diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp index a956054..8b2e736 100644 --- a/src/pulsemanager.cpp +++ b/src/pulsemanager.cpp @@ -72,8 +72,8 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()), to_front << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */ to_back << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both intermingled... */ - add_to_path (path_val, to_back); - add_to_path (path_val, to_front, false); + path_val = add_to_path (path_val, to_back); + path_val = add_to_path (path_val, to_front, false); server_binary_ = find_binary (server_working_dir_, "pulseaudio"); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git