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

diff --git a/src/Makefile.am b/src/Makefile.am
index 98aa04bca02840ac83a553d9a1ccc839a3412783..e9fc8f332e7f0c439019055fa64457e34adb1870 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,15 +88,16 @@ apps_plugin_SOURCES = \
 install-data-hook:
        if [ `id -u` == 0 ]; then \
                chown root '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
-                       chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
-                               setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin'; \
+               chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
+               ( setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin' || \
+                 chmod 4755 '$(DESTDIR)$(pluginsdir)/apps.plugin' ); \
        else \
                echo; \
                echo "ATTENTION"; \
                echo; \
                echo "$(pluginsdir)/apps.plugin requires escalated capabilities:"; \
                echo "sudo chown root '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
-               echo "sudo chmod 4755 '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
+               echo "sudo chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
                echo "sudo setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
                echo; \
        fi