[Libreoffice-commits] online.git: Makefile.am

[Henry Castro (via logerrit)]

 Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a8eb43375d824658013291c8cd8c12a57416b2e
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Mar 4 09:09:47 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Mar 5 13:07:25 2020 +0100

    wsd: makefile: run server with disabled capabilities
    
    fix runing the server with --disable-setcap, very useful
    to debug when attaching kit process
    
    Change-Id: I5ded5a1aa1924a9325ae76be46b32c0020d8ce35
    WARNING: This is just for development and debugging purposes
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89970
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index bf5725b92..f183ad6ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -302,6 +302,7 @@ EXTRA_DIST = discovery.xml \
 if HAVE_LO_PATH
 
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
+CAPABILITIES = $(if @ENABLE_SETCAP@,true,false)
 
 $(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
 	if test "z at SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; fi
@@ -322,6 +323,7 @@ run: all @JAILS_PATH@
 	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
 	@echo
 	./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
+			  --o:security.capabilities="$(CAPABILITIES)" \
 			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
 			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
 			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \