osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fail if any of the install-exec-hook commands fails. 

Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap
installation as themselves rather than as root will not "succeed" but
leave dumpcap installed without enhanced privileges, so the underlying
problem in bugs such as bug 10247 will be more obvious.

Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b
Reviewed-on: https://code.wireshark.org/review/2781
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-07-02 13:27:00 -07:00
parent 980893a15a
commit 2c9d2bea32
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -1040,15 +1040,15 @@ EXTRA_DIST = \
install-exec-hook:
if HAVE_DUMPCAP_GROUP
-chgrp $(DUMPCAP_GROUP) $(DESTDIR)$(bindir)/dumpcap
chgrp $(DUMPCAP_GROUP) $(DESTDIR)$(bindir)/dumpcap
endif
if SETCAP_INSTALL
-$(SETCAP) cap_net_raw,cap_net_admin+ep $(DESTDIR)$(bindir)/dumpcap
-chmod o-rws $(DESTDIR)$(bindir)/dumpcap
$(SETCAP) cap_net_raw,cap_net_admin+ep $(DESTDIR)$(bindir)/dumpcap
chmod o-rws $(DESTDIR)$(bindir)/dumpcap
else
if SETUID_INSTALL
-chmod o-rws $(DESTDIR)$(bindir)/dumpcap
-chmod +s $(DESTDIR)$(bindir)/dumpcap
chmod o-rws $(DESTDIR)$(bindir)/dumpcap
chmod +s $(DESTDIR)$(bindir)/dumpcap
endif
endif