[Pkg-shadow-commits] r1344 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-14 13:46:15 +0000 (Wed, 14 Nov 2007)
New Revision: 1344

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/newgrp.c
Log:
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.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-14 13:32:25 UTC (rev 1343)
+++ upstream/trunk/ChangeLog	2007-11-14 13:46:15 UTC (rev 1344)
@@ -1,5 +1,10 @@
 2007-11-14  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* src/Makefile, NEWS: Add a suidperms variable. This should ease
 	the change of permission of suid binaries for distributors (not
 	recommended).

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-11-14 13:32:25 UTC (rev 1343)
+++ upstream/trunk/NEWS	2007-11-14 13:46:15 UTC (rev 1344)
@@ -12,6 +12,9 @@
   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
 

Modified: upstream/trunk/src/newgrp.c
===================================================================
--- upstream/trunk/src/newgrp.c	2007-11-14 13:32:25 UTC (rev 1343)
+++ upstream/trunk/src/newgrp.c	2007-11-14 13:46:15 UTC (rev 1344)
@@ -454,6 +454,7 @@
 		 * 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 @@
 		signal (SIGTSTP, SIG_DFL);
 		signal (SIGTTIN, SIG_DFL);
 		signal (SIGTTOU, SIG_DFL);
+		}
 #endif				/* USE_PAM */
 	}
 #endif				/* USE_SYSLOG */