final cleanup

5 files changed, 2 insertions, 44 deletions

diff --git a/configure b/configure
index 089615384..ac7d64058 100755
--- a/configure
+++ b/configure
@@ -633,7 +633,6 @@ HAVE_WHITELIST
 HAVE_USERNS
 HAVE_NETWORK
 HAVE_GLOBALCFG
-HAVE_BIND
 HAVE_SECCOMP
 EXTRA_LDFLAGS
 EGREP
@@ -696,7 +695,6 @@ ac_user_opts='
 enable_option_checking
 enable_apparmor
 enable_seccomp
-enable_bind
 enable_globalcfg
 enable_network
 enable_userns
@@ -1337,7 +1335,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-apparmor       enable apparmor
   --disable-seccomp       disable seccomp
-  --disable-bind          disable bind
   --disable-globalcfg     if the global config file firejail.cfg is not
                           present, continue the program using defaults
   --disable-network       disable network
@@ -3085,8 +3082,6 @@ fi
 
 
 # LTS marker
-EXTRA_CFLAGS+=" -DLTS "
-
 
 HAVE_SPECTRE="no"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Spectre mitigation support in gcc or clang compiler" >&5
@@ -3572,19 +3567,6 @@ if test "x$enable_seccomp" != "xno"; then :
 
 fi
 
-HAVE_BIND=""
-# Check whether --enable-bind was given.
-if test "${enable_bind+set}" = set; then :
-  enableval=$enable_bind;
-fi
-
-if test "x$enable_bind" != "xno"; then :
-
-        HAVE_BIND="-DHAVE_BIND"
-
-
-fi
-
 HAVE_GLOBALCFG=""
 # Check whether --enable-globalcfg was given.
 if test "${enable_globalcfg+set}" = set; then :
@@ -4941,7 +4923,6 @@ echo "   seccomp: $HAVE_SECCOMP"
 echo "   <linux/seccomp.h>: $HAVE_SECCOMP_H"
 echo "   apparmor: $HAVE_APPARMOR"
 echo "   global config: $HAVE_GLOBALCFG"
-echo "   bind: $HAVE_BIND"
 echo "   network: $HAVE_NETWORK"
 echo "   user namespace: $HAVE_USERNS"
 echo "   whitelisting: $HAVE_WHITELIST"
diff --git a/configure.ac b/configure.ac
index a6bc44318..1660c2011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,6 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 
 # LTS marker
-EXTRA_CFLAGS+=" -DLTS "
-
 
 HAVE_SPECTRE="no"
 AC_MSG_CHECKING(for Spectre mitigation support in gcc or clang compiler)
@@ -63,14 +61,6 @@ AS_IF([test "x$enable_seccomp" != "xno"], [
         AC_SUBST(HAVE_SECCOMP)
 ])
 
-HAVE_BIND=""
-AC_ARG_ENABLE([bind],
-    AS_HELP_STRING([--disable-bind], [disable bind]))
-AS_IF([test "x$enable_bind" != "xno"], [
-        HAVE_BIND="-DHAVE_BIND"
-        AC_SUBST(HAVE_BIND)
-])
-
 HAVE_GLOBALCFG=""
 AC_ARG_ENABLE([globalcfg],
     AS_HELP_STRING([--disable-globalcfg], [if the global config file firejail.cfg is not present, continue the program using defaults]))
@@ -161,7 +151,6 @@ echo "   seccomp: $HAVE_SECCOMP"
 echo "   <linux/seccomp.h>: $HAVE_SECCOMP_H"
 echo "   apparmor: $HAVE_APPARMOR"
 echo "   global config: $HAVE_GLOBALCFG"
-echo "   bind: $HAVE_BIND"
 echo "   network: $HAVE_NETWORK"
 echo "   user namespace: $HAVE_USERNS"
 echo "   whitelisting: $HAVE_WHITELIST"
diff --git a/src/common.mk.in b/src/common.mk.in
index 64fe2b85a..95f375256 100644
--- a/src/common.mk.in
+++ b/src/common.mk.in
@@ -10,7 +10,6 @@ VERSION=@PACKAGE_VERSION@
 NAME=@PACKAGE_NAME@
 HAVE_SECCOMP_H=@HAVE_SECCOMP_H@
 HAVE_SECCOMP=@HAVE_SECCOMP@
-HAVE_BIND=@HAVE_BIND@
 HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
 HAVE_NETWORK=@HAVE_NETWORK@
 HAVE_USERNS=@HAVE_USERNS@
@@ -24,7 +23,7 @@ C_FILE_LIST       = $(sort $(wildcard *.c))
 OBJS = $(C_FILE_LIST:.c=.o)
 BINOBJS =  $(foreach file, $(OBJS), $file)
 
-CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_APPARMOR) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
+CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_APPARMOR) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
 LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread
 EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
 EXTRA_CFLAGS +=@EXTRA_CFLAGS@
diff --git a/src/firejail/join.c b/src/firejail/join.c
index e78cc96fa..b22a6e054 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -214,7 +214,6 @@ pid_t switch_to_child(pid_t pid) {
 void join(pid_t pid, int argc, char **argv, int index) {
         EUID_ASSERT();
         char *homedir = cfg.homedir;
-        pid_t parent = pid;
 
         extract_command(argc, argv, index);
         signal (SIGTERM, signal_handler);
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 2f25b6ede..594a6d83c 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -685,10 +685,7 @@ int main(int argc, char **argv) {
         int prog_index = -1;                      // index in argv where the program command starts
         int lockfd_network = -1;
         int lockfd_directory = -1;
-        int option_cgroup = 0;
         int custom_profile = 0; // custom profile loaded
-        int arg_seccomp_cmdline = 0;    // seccomp requested on command line (used to break out of --chroot)
-        int arg_caps_cmdline = 0;       // caps requested on command line (used to break out of --chroot)
 
         // drop permissions by default and rise them when required
         EUID_INIT();
@@ -849,7 +846,6 @@ int main(int argc, char **argv) {
                                 }
                                 arg_seccomp = 1;
                                 cfg.seccomp_list = seccomp_check_list(argv[i] + 10);
-                                arg_seccomp_cmdline = 1;
                         }
                         else
                                 exit_err_feature("seccomp");
@@ -862,7 +858,6 @@ int main(int argc, char **argv) {
                                 }
                                 arg_seccomp = 1;
                                 cfg.seccomp_list_drop = seccomp_check_list(argv[i] + 15);
-                                arg_seccomp_cmdline = 1;
                         }
                         else
                                 exit_err_feature("seccomp");
@@ -875,7 +870,6 @@ int main(int argc, char **argv) {
                                 }
                                 arg_seccomp = 1;
                                 cfg.seccomp_list_keep = seccomp_check_list(argv[i] + 15);
-                                arg_seccomp_cmdline = 1;
                         }
                         else
                                 exit_err_feature("seccomp");
@@ -894,10 +888,8 @@ int main(int argc, char **argv) {
                                 exit_err_feature("seccomp");
                 }
 #endif
-                else if (strcmp(argv[i], "--caps") == 0) {
+                else if (strcmp(argv[i], "--caps") == 0)
                         arg_caps_default_filter = 1;
-                        arg_caps_cmdline = 1;
-                }
                 else if (strcmp(argv[i], "--caps.drop=all") == 0)
                         arg_caps_drop_all = 1;
                 else if (strncmp(argv[i], "--caps.drop=", 12) == 0) {
@@ -907,7 +899,6 @@ int main(int argc, char **argv) {
                                 errExit("strdup");
                         // verify caps list and exit if problems
                         caps_check_list(arg_caps_list, NULL);
-                        arg_caps_cmdline = 1;
                 }
                 else if (strncmp(argv[i], "--caps.keep=", 12) == 0) {
                         arg_caps_keep = 1;
@@ -916,7 +907,6 @@ int main(int argc, char **argv) {
                                 errExit("strdup");
                         // verify caps list and exit if problems
                         caps_check_list(arg_caps_list, NULL);
-                        arg_caps_cmdline = 1;
                 }