From: Christos Zoulas <christos@zoulas.com>
Date: Sat, 3 Aug 2019 11:51:59 +0000 (+0000)
Subject: always accept --no-sandbox/-S (Christoph Biedl)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b55a5fe6739f2fc329b8627730c3a4c4bcc92231;p=file

always accept --no-sandbox/-S (Christoph Biedl)
---

diff --git a/src/file.c b/src/file.c
index 9c374e60..89d8cfb9 100644
--- a/src/file.c
+++ b/src/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: file.c,v 1.183 2019/07/13 16:23:58 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.184 2019/08/03 11:51:59 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -76,13 +76,7 @@ int getopt_long(int, char * const *, const char *,
 # define IFLNK_L ""
 #endif
 
-#ifdef HAVE_LIBSECCOMP
-# define SECCOMP_S "S"
-#else
-# define SECCOMP_S ""
-#endif
-
-#define FILE_FLAGS	"bcCdE" IFLNK_h "ik" IFLNK_L "lNnprs" SECCOMP_S "vzZ0"
+#define FILE_FLAGS	"bcCdE" IFLNK_h "ik" IFLNK_L "lNnprsSvzZ0"
 #define OPTSTRING	"bcCde:Ef:F:hiklLm:nNpP:rsSvzZ0"
 
 # define USAGE  \
diff --git a/src/file_opts.h b/src/file_opts.h
index 2b7d5347..4f894cc5 100644
--- a/src/file_opts.h
+++ b/src/file_opts.h
@@ -57,8 +57,6 @@ OPT('P', "parameter", 1, 0, "            set file engine parameter limits\n"
 OPT('r', "raw", 0, 0, "                  don't translate unprintable chars to \\ooo\n")
 OPT('s', "special-files", 0, 0, "        treat special (block/char devices) files as\n"
     "                             ordinary ones\n")
-#ifdef HAVE_LIBSECCOMP
 OPT('S', "no-sandbox", 0, 0, "           disable system call sandboxing\n")
-#endif
 OPT('C', "compile", 0, 0, "              compile file specified by -m\n")
 OPT('d', "debug", 0, 0, "                print debugging messages\n")