Remove -lBlocksRuntime

diff --git a/Makefile b/Makefile
index b66a74eea82bade52a8e6c653b2616a885eb0605..9abec7168b1fcba6be57a55977e095d31683169d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,6 @@ endif
 COMPILER = $(shell $(CC) -v 2>&1 | grep -E '(gcc|clang) version' | grep -oE '(clang|gcc)')
 ifeq ($(COMPILER),clang)
        CFLAGS += -fblocks
-       LDFLAGS += -lBlocksRuntime
 endif
 
 ifeq ("$(wildcard /usr/include/libnl3/netlink/route/link/macvlan.h)","/usr/include/libnl3/netlink/route/link/macvlan.h")

diff --git a/contain.c b/contain.c
index 5582994decb0dfc4e1445c1aae8f0f5677644694..085803e3bb1f0495fcabc47a3f150f2ded6825fa 100644 (file)
--- a/contain.c
+++ b/contain.c
@@ -79,11 +79,13 @@ static bool containDropPrivs(struct nsjconf_t *nsjconf)
        if (setgroups(0, group_list) == -1) {
                PLOG_D("setgroups(NULL) failed");
        }
-       if (syscall(__NR_setresgid, nsjconf->inside_gid, nsjconf->inside_gid, nsjconf->inside_gid) == -1) {
+       if (syscall(__NR_setresgid, nsjconf->inside_gid, nsjconf->inside_gid, nsjconf->inside_gid)
+           == -1) {
                PLOG_E("setresgid(%u)", nsjconf->inside_gid);
                return false;
        }
-       if (syscall(__NR_setresuid, nsjconf->inside_uid, nsjconf->inside_uid, nsjconf->inside_uid) == -1) {
+       if (syscall(__NR_setresuid, nsjconf->inside_uid, nsjconf->inside_uid, nsjconf->inside_uid)
+           == -1) {
                PLOG_E("setresuid(%u)", nsjconf->inside_uid);
                return false;
        }

diff --git a/net.c b/net.c
index 652363110d01d0c337732840892e8e7f4eebefa8..6f659c8285554204296e632e8726fb717c65e687 100644 (file)
--- a/net.c
+++ b/net.c
@@ -50,7 +50,7 @@ extern char **environ;
 #if defined(NSJAIL_NL3_WITH_MACVLAN)
 #include <netlink/route/link.h>
 #include <netlink/route/link/macvlan.h>
-bool netInitNsFromParent(struct nsjconf_t * nsjconf, int pid)
+bool netInitNsFromParent(struct nsjconf_t *nsjconf, int pid)
 {
        if (nsjconf->clone_newnet == false) {
                return true;

diff --git a/nsjail.c b/nsjail.c
index 4f03d9c17601843d8108bc242c2e3c12cb3b7549..71b2f2de0659848dbf7b4d456bd8282ad3a122fe 100644 (file)
--- a/nsjail.c
+++ b/nsjail.c
@@ -192,3 +192,8 @@ int main(int argc, char *argv[])
        }
        return 0;
 }
+
+/*
+ * To satisfy requirement for BlocksRuntime in clang -fblocks
+ */
+void *_NSConcreteStackBlock[32] = { 0 };

diff --git a/pid.c b/pid.c
index b145b810546e0c4cf96cf43675f60b3763e69264..c53e581fab4651924bc4de26748efc3e37823f03 100644 (file)
--- a/pid.c
+++ b/pid.c
@@ -30,7 +30,7 @@
 
 #include "log.h"
 
-bool pidInitNs(struct nsjconf_t * nsjconf)
+bool pidInitNs(struct nsjconf_t *nsjconf)
 {
        if (nsjconf->mode != MODE_STANDALONE_EXECVE) {
                return true;