@cryptotaxi247 / netdata-1 / commits / 7cc42f2b2

make install now attempts to setcap apps.plugin, but if it fails it makes it setuid to root

Costa Tsaousis committed May 14, 2016 at 03:16 UTC 7cc42f2b2e5821a3e2dc4dde01c600add4762369
1 file changed +4 -3
src/Makefile.am
+4 -3
@@ -88,15 +88,16 @@ apps_plugin_SOURCES = \
88 install-data-hook:
89 if [ `id -u` == 0 ]; then \
90 chown root '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
91 - chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
92 - setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin'; \
91 + chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
92 + ( setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin' || \
93 + chmod 4755 '$(DESTDIR)$(pluginsdir)/apps.plugin' ); \
94 else \
95 echo; \
96 echo "ATTENTION"; \
97 echo; \
98 echo "$(pluginsdir)/apps.plugin requires escalated capabilities:"; \
99 echo "sudo chown root '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
99 - echo "sudo chmod 4755 '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
100 + echo "sudo chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
101 echo "sudo setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
102 echo; \
103 fi