[Pkg-shadow-commits] r484 - branches/experimental/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-08-28 08:44:29 +0000 (Sun, 28 Aug 2005)
New Revision: 484

Modified:
   branches/experimental/debian/patches/010_more-i18ned-messages
   branches/experimental/debian/patches/357_newgrp-stop_cont-proxy
Log:
Just re-indent.


Modified: branches/experimental/debian/patches/010_more-i18ned-messages
===================================================================
--- branches/experimental/debian/patches/010_more-i18ned-messages	2005-08-28 08:43:36 UTC (rev 483)
+++ branches/experimental/debian/patches/010_more-i18ned-messages	2005-08-28 08:44:29 UTC (rev 484)
@@ -95,7 +95,7 @@
  	if (child < 0) {
  		/* error in fork() */
 -		fprintf (stderr, "login: failure forking: %s",
-+	  fprintf (stderr, _("login: failure forking: %s"),
++		fprintf (stderr, _("login: failure forking: %s"),
  			 strerror (errno));
  		PAM_END;
  		exit (0);
@@ -121,7 +121,7 @@
  		if (child < 0) {
  			/* error in fork() */
 -			fprintf (stderr, "%s: failure forking: %s",
-+		  fprintf (stderr, _("%s: failure forking: %s"),
++			fprintf (stderr, _("%s: failure forking: %s"),
  				 is_newgrp ? "newgrp" : "sg", strerror (errno));
  			exit (1);
  		} else if (child) {

Modified: branches/experimental/debian/patches/357_newgrp-stop_cont-proxy
===================================================================
--- branches/experimental/debian/patches/357_newgrp-stop_cont-proxy	2005-08-28 08:43:36 UTC (rev 483)
+++ branches/experimental/debian/patches/357_newgrp-stop_cont-proxy	2005-08-28 08:44:29 UTC (rev 484)
@@ -4,7 +4,7 @@
 
 Status wrt upstream: Not yet fixed in upstream, while "su" is fixed since 4.0.5
 
-Notes:	Affects only operation with CLOSE_SESSIONS=yes. When it's set to "no",
+Notes:
 	newgrp doesn't fork and create child process, it just calls exec(),
 	so there won't be "newgrp" process between parent and child shells.
 
@@ -19,20 +19,20 @@
  			exit (1);
  		} else if (child) {
  			/* parent - wait for child to finish, then log session close */
-+				int cst = 0;
++			int cst = 0;
  			do {
 -				pid = waitpid (child, NULL, 0);
 -			} while (pid != child);
-+					errno = 0;
-+					pid = waitpid (child, &cst, WUNTRACED);
-+					if (pid == child && WIFSTOPPED(cst)) {
-+						/* stop when child stops */
-+						raise(SIGSTOP);
-+						/* wake child when resumed */
-+						kill(child, SIGCONT);
-+					}
-+				} while (pid == child && WIFSTOPPED(cst) ||
-+						pid != child && errno == EINTR);
++				errno = 0;
++				pid = waitpid (child, &cst, WUNTRACED);
++				if (pid == child && WIFSTOPPED(cst)) {
++					/* stop when child stops */
++					raise(SIGSTOP);
++					/* wake child when resumed */
++					kill(child, SIGCONT);
++				}
++			} while (pid == child && WIFSTOPPED(cst) ||
++					pid != child && errno == EINTR);
  			SYSLOG ((LOG_INFO,
  				 "user `%s' (login `%s' on %s) returned to group `%s'",
  				 name, loginname, tty,