[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - debian/loolwsd.postinst.in tools/Config.cpp

[Andras Timar (via logerrit)]

 debian/loolwsd.postinst.in |    2 +-
 tools/Config.cpp           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d3728ed2b4a64cbcf9de920af2d4f2d468fd42b
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jul 5 09:01:50 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jul 23 10:36:39 2020 +0200

    systemplate files are not writable by lool user
    
    See also f1be65668c749526011faa39266f289522a9cf68
    systemplate files should not be writable by lool user
    
    Change-Id: I5684248d3d4b4b0ba56f8c5ab490a6e7df0e0038
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98071
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99229
    Tested-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index 41198e75a..f46e0ea81 100644
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -27,7 +27,7 @@ case "$1" in
 	loolwsd-generate-proof-key >/dev/null 2>&1
     cat << EOF > /etc/apt/apt.conf.d/25loolwsd
 // Rebuild systemplate of @APP_NAME@
-DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1'"; };
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1"; };
 EOF
 	;;
 
diff --git a/tools/Config.cpp b/tools/Config.cpp
index 86339915a..cdcc35155 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -364,7 +364,7 @@ int Config::main(const std::vector<std::string>& args)
     }
     else if (args[0] == "update-system-template")
     {
-        const char command[] = "su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1'";
+        const char command[] = "loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1";
         std::cout << "Running the following command:" << std::endl
                   << command << std::endl;