diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-02 13:27:00 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-07-02 21:54:28 +0000 |
| commit | fcea3cb042a837d3e9191eb6f1dd8eee214afa8c (patch) | |
| tree | 04a93137583d69b02158c43f799b3bc06c09cb42 | |
| parent | d57051446bec7f63cf8bcf6e7045632e3636a09f (diff) | |
| download | wireshark-fcea3cb042a837d3e9191eb6f1dd8eee214afa8c.tar.gz | |
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>
(cherry picked from commit 2c9d2bea32238223634ae975cfd4e682ba1a0b2b)
Reviewed-on: https://code.wireshark.org/review/2782
Reviewed-by: Evan Huus <eapache@gmail.com>
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index ecfe36e2d0..67e86dc38a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1044,15 +1044,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 |