diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rwxr-xr-x | configure | 9 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | src/common.mk.in | 6 |
4 files changed, 10 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index ddc63c1af..1044f1ade 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -105,7 +105,7 @@ realinstall: | |||
105 | # firejail executable | 105 | # firejail executable |
106 | install -m 0755 -d $(DESTDIR)$(bindir) | 106 | install -m 0755 -d $(DESTDIR)$(bindir) |
107 | install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) | 107 | install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) |
108 | ifeq ($(HAVE_SUID),yes) | 108 | ifeq ($(HAVE_SUID),-DHAVE_SUID) |
109 | chmod u+s $(DESTDIR)$(bindir)/firejail | 109 | chmod u+s $(DESTDIR)$(bindir)/firejail |
110 | endif | 110 | endif |
111 | # firemon executable | 111 | # firemon executable |
@@ -3757,10 +3757,9 @@ if test "${enable_suid+set}" = set; then : | |||
3757 | enableval=$enable_suid; | 3757 | enableval=$enable_suid; |
3758 | fi | 3758 | fi |
3759 | 3759 | ||
3760 | if test "x$enable_suid" = "xno"; then : | 3760 | if test "x$enable_suid" != "xno"; then : |
3761 | HAVE_SUID="no" | 3761 | |
3762 | else | 3762 | HAVE_SUID="-DHAVE_SUID" |
3763 | HAVE_SUID="yes" | ||
3764 | 3763 | ||
3765 | fi | 3764 | fi |
3766 | 3765 | ||
@@ -3854,7 +3853,7 @@ if test "x$enable_lts" = "xyes"; then : | |||
3854 | HAVE_USERNS="" | 3853 | HAVE_USERNS="" |
3855 | HAVE_X11="" | 3854 | HAVE_X11="" |
3856 | HAVE_FILE_TRANSFER="" | 3855 | HAVE_FILE_TRANSFER="" |
3857 | HAVE_SUID="yes" | 3856 | HAVE_SUID="-DHAVE_SUID" |
3858 | BUSYBOX_WORKAROUND="no" | 3857 | BUSYBOX_WORKAROUND="no" |
3859 | HAVE_CONTRIB_INSTALL="no", | 3858 | HAVE_CONTRIB_INSTALL="no", |
3860 | 3859 | ||
diff --git a/configure.ac b/configure.ac index ace02dcb6..2870148cf 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -191,10 +191,9 @@ HAVE_SUID="" | |||
191 | AC_SUBST([HAVE_SUID]) | 191 | AC_SUBST([HAVE_SUID]) |
192 | AC_ARG_ENABLE([suid], | 192 | AC_ARG_ENABLE([suid], |
193 | [AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])]) | 193 | [AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])]) |
194 | AS_IF([test "x$enable_suid" = "xno"], | 194 | AS_IF([test "x$enable_suid" != "xno"], [ |
195 | [HAVE_SUID="no"], | 195 | HAVE_SUID="-DHAVE_SUID" |
196 | [HAVE_SUID="yes"] | 196 | ]) |
197 | ) | ||
198 | 197 | ||
199 | HAVE_FATAL_WARNINGS="" | 198 | HAVE_FATAL_WARNINGS="" |
200 | AC_SUBST([HAVE_FATAL_WARNINGS]) | 199 | AC_SUBST([HAVE_FATAL_WARNINGS]) |
@@ -257,7 +256,7 @@ AS_IF([test "x$enable_lts" = "xyes"], [ | |||
257 | HAVE_USERNS="" | 256 | HAVE_USERNS="" |
258 | HAVE_X11="" | 257 | HAVE_X11="" |
259 | HAVE_FILE_TRANSFER="" | 258 | HAVE_FILE_TRANSFER="" |
260 | HAVE_SUID="yes" | 259 | HAVE_SUID="-DHAVE_SUID" |
261 | BUSYBOX_WORKAROUND="no" | 260 | BUSYBOX_WORKAROUND="no" |
262 | HAVE_CONTRIB_INSTALL="no", | 261 | HAVE_CONTRIB_INSTALL="no", |
263 | ]) | 262 | ]) |
diff --git a/src/common.mk.in b/src/common.mk.in index c8329e7c2..c55c26f42 100644 --- a/src/common.mk.in +++ b/src/common.mk.in | |||
@@ -22,11 +22,7 @@ HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ | |||
22 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | 22 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ |
23 | HAVE_GCOV=@HAVE_GCOV@ | 23 | HAVE_GCOV=@HAVE_GCOV@ |
24 | HAVE_SELINUX=@HAVE_SELINUX@ | 24 | HAVE_SELINUX=@HAVE_SELINUX@ |
25 | ifeq (@HAVE_SUID@, yes) | 25 | HAVE_SUID=@HAVE_SUID@ |
26 | HAVE_SUID=-DHAVE_SUID | ||
27 | else | ||
28 | HAVE_SUID= | ||
29 | endif | ||
30 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ | 26 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ |
31 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ | 27 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ |
32 | HAVE_OUTPUT=@HAVE_OUTPUT@ | 28 | HAVE_OUTPUT=@HAVE_OUTPUT@ |