loolwsd/LOOLWSD.cpp | 2 ++ loolwsd/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit b8f0cbb109cc24687db3e93a26bf42223d8d5dcb Author: Henry Castro <[email protected]> Date: Fri Dec 4 20:45:49 2015 -0400 loolwsd: add cap_sys_admin capability diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 5f0e89d..e5ca322 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -984,6 +984,7 @@ void LOOLWSD::componentMain() dropCapability(CAP_SYS_CHROOT); dropCapability(CAP_MKNOD); dropCapability(CAP_FOWNER); + dropCapability(CAP_SYS_ADMIN); #else dropCapability(); #endif @@ -1265,6 +1266,7 @@ 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 357986d..7b7123f 100644 --- a/loolwsd/Makefile.am +++ b/loolwsd/Makefile.am @@ -30,7 +30,7 @@ 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_chroot=ep loolwsd; \ + sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_admin,cap_sys_chroot=ep loolwsd; \ 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
