loolwsd/LOOLWSD.cpp | 2 -- loolwsd/Makefile.am | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit 294422b5a038e6faa9c112c40bda93413196b244 Author: Henry Castro <[email protected]> Date: Thu Dec 10 07:47:33 2015 -0400 loolwsd: remove cap_sys_admin capability diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 8d82121..6390f5f 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -908,7 +908,6 @@ void LOOLWSD::componentMain() dropCapability(CAP_SYS_CHROOT); dropCapability(CAP_MKNOD); dropCapability(CAP_FOWNER); - dropCapability(CAP_SYS_ADMIN); #else dropCapability(); #endif @@ -1212,7 +1211,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) dropCapability(CAP_SYS_CHROOT); dropCapability(CAP_MKNOD); dropCapability(CAP_FOWNER); - dropCapability(CAP_SYS_ADMIN); #else dropCapability(); #endif diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am index 62f24ee..c1acb06 100644 --- a/loolwsd/Makefile.am +++ b/loolwsd/Makefile.am @@ -36,8 +36,8 @@ clean-cache: all-local: loolwsd if test "$$BUILDING_FROM_RPMBUILD" != yes; then \ if test `uname -s` = Linux; then \ - sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_admin,cap_sys_chroot=ep loolwsd; \ - sudo @SETCAP@ cap_sys_admin=ep loolmount; \ + sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolwsd; \ + sudo @SETCAP@ cap_sys_admin=ep loolmount; \ else \ sudo chown root loolwsd && sudo chmod u+s loolwsd; \ fi; \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
