[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - kit/ForKit.cpp wsd/LOOLWSD.cpp

[Jan Holesovsky]

 kit/ForKit.cpp  |    4 ++++
 wsd/LOOLWSD.cpp |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 63eeb4b841e7dd68f9856a54f21ff5734f970072
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Aug 10 11:11:05 2017 +0200

    Warn more about missing capabilities, and advise what to do on SLES11.
    
    Change-Id: I93587db6fa32c1c505877c20857799be71ee162f
    (cherry picked from commit 894c5f2cc256d9db69add9c0922dd937e297fb98)
    Reviewed-on: https://gerrit.libreoffice.org/48966
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index ab11f626..36d1c86b 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -472,7 +472,11 @@ int main(int argc, char** argv)
         LOG_INF("Note: LD_BIND_NOW is not set.");
 
     if (!NoCapsForKit && !haveCorrectCapabilities())
+    {
+        std::cerr << "FATAL: Capabilities are not set for the loolforkit program." << std::endl;
+        std::cerr << "If you are on SLES11, please set 'file_caps=1' as kernel boot option." << std::endl << std::endl;
         return Application::EXIT_SOFTWARE;
+    }
 
     // Initialize LoKit
     if (!globalPreinit(loTemplate))
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 04309102..5cc3fe6f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2484,7 +2484,7 @@ int LOOLWSD::innerMain()
         {
             const auto msg = "Failed to fork child processes.";
             LOG_FTL(msg);
-            std::cerr << msg << std::endl;
+            std::cerr << "FATAL: " << msg << std::endl;
             throw std::runtime_error(msg);
         }