Add a variable to set the suid permissions. This should simplify Gentoo's

patch shadow-4.0.11.1-perms.patch.

diff --git a/ChangeLog b/ChangeLog
index c18c095d22c84b488c24afbf1d0d5e0bfa0296b3..4d7de3d28326065abf8f0175c0ccc96bc732d432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-14  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/Makefile, NEWS: Add a suidperms variable. This should ease
+       the change of permission of suid binaries for distributors (not
+       recommended).
+
 2007-11-10  Nicolas François  <nicolas.francois@centraliens.net>
 
        * ./, libmisc/, src/, contrib/, doc/, lib/, man/, man/sv/,

diff --git a/NEWS b/NEWS
index 18c4998b28e0d2b5e8b4d63083f8fdde5888fd09..e0c251036fa855c3d669374eedc1d42ea48149b1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ shadow-4.0.18.1 -> shadow-4.0.18.2                                    UNRELEASED
   Fedora's shadow-4.0.18.1-overflow.patch.
 - newgrp: Don't ask for a password if there are no group passwords. Just
   directly give up.
+- The permissions of the suid binaries is now configurable in
+  src/Makefile.am. Note that changing the permissions is not recommended.
 
 shadow-4.0.18.1 -> shadow-4.0.18.2                                     28-10-2007
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4049226facfe72b3809f0928058c1da001562555..76a99a01c9471e9b53a8185233a4482fc6f9e4ee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = \
 
 ubindir = ${prefix}/bin
 usbindir = ${prefix}/sbin
+suidperms = 4755
 
 INCLUDES = \
        -I${top_srcdir}/lib \
@@ -91,8 +92,8 @@ install-am: all-am
        ln -sf newgrp   $(DESTDIR)$(ubindir)/sg
        ln -sf vipw     $(DESTDIR)$(usbindir)/vigr
        for i in $(suidbins); do \
-               chmod -f 4755 $(DESTDIR)$(bindir)/$$i; \
+               chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
        done
        for i in $(suidubins); do \
-               chmod -f 4755 $(DESTDIR)$(ubindir)/$$i; \
+               chmod -f $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
        done