[SCM] GNU Inetutils branch, master, updated. inetutils-1_7-30-g7000659

[Alfred M. Szmidt]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  700065918b9a33d08ceffbfe296a2d6220a70209 (commit)
      from  49620c40386712a2b4dd6625ff0400be4855c1ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=700065918b9a33d08ceffbfe296a2d6220a70209


commit 700065918b9a33d08ceffbfe296a2d6220a70209
Author: Alfred M. Szmidt <address@hidden>
Date:   Fri Jan 29 18:19:02 2010 +0100

    Clarify warning message when installing a SUID root program.

diff --git a/ChangeLog b/ChangeLog
index 2a3ef02..3883212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-29  Alfred M. Szmidt  <address@hidden>
+
+       * ping/Makefile.am (install-ping-hook): Clarify warning message
+       when installing a SUID root program.
+       * src/Makefile.am (install-traceroute-hook, install-rsh-hook)
+       (install-rlogin-hook, install-rcp-hook): Likewise.
+
 2010-01-28  Sergey Poznyakoff  <address@hidden>
 
        Implement -a option; correctly print interface metric.
diff --git a/ping/Makefile.am b/ping/Makefile.am
index 80e3578..33584dd 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -33,13 +33,11 @@ ping6_SOURCES = ping6.c ping_common.c ping_common.h ping6.h
 SUIDMODE = -o root -m 4775
 
 install-ping-hook:
-       address@hidden program in $(bin_PROGRAMS); do \
-       $(INSTALL_PROGRAM) $$program $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) 
$(DESTDIR)$(bindir)/`echo $$program|sed '$(transform)'` ; \
+       address@hidden x in $(bin_PROGRAMS); do \
+       $(INSTALL_PROGRAM) $$x $(SUIDMODE) $(AM_INSTALL_PROGRAM_FLAGS) 
$(DESTDIR)$(bindir)/`echo $$x|sed '$(transform)'` ; \
        if test $$? -ne 0; then \
-               echo 'INSTALL-ERROR:'; \
-               echo 'INSTALL-ERROR: THIS PROGRAM('$$program') MUST BE 
INSTALLED SETUID ROOT'; \
-               echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) '$$program' $(SUIDMODE) 
$(DESTDIR)$(bindir)/'$$program; \
-               echo 'INSTALL-ERROR:'; \
+         echo "WARNING: insufficient access; not installing $$x"; \
+         echo "NOTE: To install $$x run 'make install' as root"; \
        fi \
        done
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c77e63d..df53858 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,37 +103,29 @@ install-exec-hook: @traceroute_INSTALL_HOOK@ 
@rsh_INSTALL_HOOK@ @rlogin_INSTALL_
 install-traceroute-hook:
        address@hidden(INSTALL_PROGRAM) traceroute $(SUIDMODE) 
$(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo traceroute|sed 
'$(transform)'` ; \
        if test $$? -ne 0; then \
-               echo 'INSTALL-ERROR:'; \
-               echo 'INSTALL-ERROR: THIS PROGRAM(traceroute) MUST BE INSTALLED 
SETUID ROOT'; \
-               echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) 'traceroute' 
$(SUIDMODE) $(DESTDIR)$(bindir)/'traceroute; \
-               echo 'INSTALL-ERROR:'; \
+         echo "WARNING: insufficient access; not installing traceroute"; \
+         echo "NOTE: To install traceroute run 'make install' as root"; \
        fi
 
 install-rsh-hook:
        address@hidden(INSTALL_PROGRAM) rsh $(SUIDMODE) 
$(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rsh|sed '$(transform)'` ; 
\
        if test $$? -ne 0; then \
-               echo 'INSTALL-ERROR:'; \
-               echo 'INSTALL-ERROR: THIS PROGRAM(rsh) MUST BE INSTdALLED 
SETUID ROOT'; \
-               echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rsh $(SUIDMODE) 
$(DESTDIR)$(bindir)/rsh'; \
-               echo 'INSTALL-ERROR:'; \
+         echo "WARNING: insufficient access; not installing rsh"; \
+         echo "NOTE: To install rsh run 'make install' as root"; \
        fi
 
 install-rlogin-hook:
        address@hidden(INSTALL_PROGRAM) rlogin $(SUIDMODE) 
$(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rlogin|sed 
'$(transform)'` ; \
        if test $$? -ne 0; then \
-               echo 'INSTALL-ERROR:'; \
-               echo 'INSTALL-ERROR: THIS PROGRAM(rlogin) MUST BE INSTALLED 
SETUID ROOT'; \
-               echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rlogin $(SUIDMODE) 
$(DESTDIR)$(bindir)/rlogin'; \
-               echo 'INSTALL-ERROR:'; \
+         echo "WARNING: insufficient access; not installing rlogin"; \
+         echo "NOTE: To install rlogin run 'make install' as root"; \
        fi
 
 install-rcp-hook:
        address@hidden(INSTALL_PROGRAM) rcp $(SUIDMODE) 
$(AM_INSTALL_PROGRAM_FLAGS) $(DESTDIR)$(bindir)/`echo rcp|sed '$(transform)'` ; 
\
        if test $$? -ne 0; then \
-               echo 'INSTALL-ERROR:'; \
-               echo 'INSTALL-ERROR: THIS PROGRAM(rcp) MUST BE INSTALLED SETUID 
ROOT'; \
-               echo 'INSTALL-ERROR: $(INSTALL_PROGRAM) rcp $(SUIDMODE) 
$(DESTDIR)$(bindir)/rcp'; \
-               echo 'INSTALL-ERROR:'; \
+         echo "WARNING: insufficient access; not installing rcp"; \
+         echo "NOTE: To install rcp run 'make install' as root"; \
        fi
 
 @PATHDEFS_MAKE@

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    7 +++++++
 ping/Makefile.am |   10 ++++------
 src/Makefile.am  |   24 ++++++++----------------
 3 files changed, 19 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
GNU Inetutils