Declare the child and pid variable at the beginning of a block. This

fixes a compilation issue with gcc 2.95. The intent is the same as
Gentoo's patch shadow-4.0.12-gcc2.patch.

diff --git a/ChangeLog b/ChangeLog
index 4d7de3d28326065abf8f0175c0ccc96bc732d432..b4743efef31933e286c13cef99d04754f5b39ab8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-14  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/newgrp.c, NEWS: Declare the child and pid variable at the
+       beginning of a block. This fixes a compilation issue with gcc 2.95.
+
 2007-11-14  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/Makefile, NEWS: Add a suidperms variable. This should ease

diff --git a/NEWS b/NEWS
index e0c251036fa855c3d669374eedc1d42ea48149b1..dc2952dbc755262fb52284ac5157a3c27f73f30b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ shadow-4.0.18.1 -> shadow-4.0.18.2                                    UNRELEASED
   directly give up.
 - The permissions of the suid binaries is now configurable in
   src/Makefile.am. Note that changing the permissions is not recommended.
+- newgrp.c: Declare the child and pid variable at the beginning of a block.
+  This fixes a compilation issue with gcc 2.95. The intent is the same as
+  Gentoo's patch shadow-4.0.12-gcc2.patch.
 
 shadow-4.0.18.1 -> shadow-4.0.18.2                                     28-10-2007
 

diff --git a/src/newgrp.c b/src/newgrp.c
index 3811573104f3046b520792dcca4821954eef7e09..ae2b8d7e8fc38c2e8894460aefc785bbaab1621b 100644 (file)
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -454,6 +454,7 @@ int main (int argc, char **argv)
                 * avoid any possibility of the parent being stopped when it
                 * receives SIGCHLD from the terminating subshell.  -- JWP
                 */
+               {
                pid_t child, pid;
 
                signal (SIGINT, SIG_IGN);
@@ -502,6 +503,7 @@ int main (int argc, char **argv)
                signal (SIGTSTP, SIG_DFL);
                signal (SIGTTIN, SIG_DFL);
                signal (SIGTTOU, SIG_DFL);
+               }
 #endif                         /* USE_PAM */
        }
 #endif                         /* USE_SYSLOG */