loolwsd/LOOLSession.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 029a41ba81ab2abdf35e16dce002b1e6f93c7f1a
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue May 26 10:08:27 2015 +0200
Fix non-debug build.
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index b93cba5..96e4dd4 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -382,12 +382,19 @@ void MasterProcessSession::preSpawn()
args.push_back("--jail=" + jail.toString());
args.push_back("--losubpath=" + LOOLWSD::loSubPath);
+ std::string executable;
+
#if ENABLE_DEBUG
if (LOOLWSD::runningAsRoot)
+ {
args.push_back("--uid=" + std::to_string(LOOLWSD::uid));
+ executable = "/usr/bin/sudo";
+ }
+ else
#endif
-
- const std::string executable = (LOOLWSD::runningAsRoot ? "/usr/bin/sudo" :
Application::instance().commandPath());
+ {
+ executable = Application::instance().commandPath();
+ }
Application::instance().logger().information(Util::logPrefix() +
"Launching child: " + executable + " " + Poco::cat(std::string(" "),
args.begin(), args.end()));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
