[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Jan Holesovsky (via logerrit)]

 wsd/LOOLWSD.cpp |    6 +++++-
 wsd/LOOLWSD.hpp |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 09005eb1cf67b12dd0be7623646c2e900c81b241
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 28 14:55:42 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Feb 29 11:01:00 2020 +0100

    android: Don't even try to read these values, seem to trigger an exception.
    
    All the code that is using them is compiled out on Android anyway.
    
    Change-Id: Ica349135202211ecdcb095bb82aa677f2dee19ba
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89714
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5611edba5..61b9d8f09 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -213,7 +213,6 @@ static int careerSpanMs = 0;
 
 /// The timeout for a child to spawn, initially high, then reset to the default.
 int ChildSpawnTimeoutMs = CHILD_TIMEOUT_MS * 4;
-bool LOOLWSD::NoCapsForKit = false;
 std::atomic<unsigned> LOOLWSD::NumConnections;
 std::set<std::string> LOOLWSD::EditFileExtensions;
 
@@ -699,8 +698,11 @@ std::atomic<uint64_t> LOOLWSD::NextConnectionId(1);
 std::atomic<int> LOOLWSD::ForKitWritePipe(-1);
 std::atomic<int> LOOLWSD::ForKitProcId(-1);
 #endif
+#if !MOBILEAPP
+bool LOOLWSD::NoCapsForKit = false;
 bool LOOLWSD::NoSeccomp = false;
 bool LOOLWSD::AdminEnabled = true;
+#endif
 #ifdef FUZZER
 bool LOOLWSD::DummyLOK = false;
 std::string LOOLWSD::FuzzFileName;
@@ -1100,9 +1102,11 @@ void LOOLWSD::initialize(Application& self)
     LOOLWSD::MaxConnections = MAX_CONNECTIONS;
     LOOLWSD::MaxDocuments = MAX_DOCUMENTS;
 
+#if !MOBILEAPP
     NoSeccomp = !getConfigValue<bool>(conf, "security.seccomp", true);
     NoCapsForKit = !getConfigValue<bool>(conf, "security.capabilities", true);
     AdminEnabled = getConfigValue<bool>(conf, "admin_console.enable", true);
+#endif
 
 #if ENABLE_SUPPORT_KEY
     const std::string supportKeyString = getConfigValue<std::string>(conf, "support_key", "");
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index d14b77ae5..204129d77 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -49,9 +49,11 @@ public:
     // so just keep these as statics.
     static std::atomic<uint64_t> NextConnectionId;
     static unsigned int NumPreSpawnedChildren;
+#if !MOBILEAPP
     static bool NoCapsForKit;
     static bool NoSeccomp;
     static bool AdminEnabled;
+#endif
     static std::atomic<int> ForKitWritePipe;
     static std::atomic<int> ForKitProcId;
     static bool DummyLOK;