Stricter check for clang

diff --git a/Makefile b/Makefile
index 9236c644a2cd9de6784ef49e04ae006a50a44463..7d9acb8242b647c3aec740c6367652e7b8264f88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,8 @@ CFLAGS += -O2 -g -ggdb -c -std=gnu11 \
 
 LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -Wa,--noexecstack
 
-COMPILER_CLANG = $(shell $(CC) -v 2>&1 | grep version | head -n1 | egrep -o clang)
+COMPILER_CLANG = $(shell $(CC) -v 2>&1 | grep "clang version" | grep -o "clang")
+
 ifeq ($(COMPILER_CLANG),clang)
        CFLAGS += -fblocks
        LDFLAGS += -lBlocksRuntime

diff --git a/nsjail.c b/nsjail.c
index 6dbfc0c727f8d61abef6f772f9dda6c47579c391..5f125b65a15dfde33f5abcac5427d7776987a1b9 100644 (file)
--- a/nsjail.c
+++ b/nsjail.c
@@ -115,6 +115,7 @@ static void nsjailListenMode(struct nsjconf_t *nsjconf)
        if (listenfd == -1) {
                return;
        }
+       defer(close(listenfd));
        for (;;) {
                if (nsjailSigFatal > 0) {
                        subprocKillAll(nsjconf);