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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-08-29 19:49:37 +0000 (Mon, 29 Aug 2005)
New Revision: 493

Modified:
   branches/experimental/debian/patches/437_su_add_GNU_options_1
Log:
With the time, one chunk was not applied at the right location.


Modified: branches/experimental/debian/patches/437_su_add_GNU_options_1
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_1	2005-08-29 19:38:35 UTC (rev 492)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_1	2005-08-29 19:49:37 UTC (rev 493)
@@ -7,8 +7,8 @@
        * !doshell is broken (argv is not incremented)
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:39.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 11:50:40.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-29 21:45:05.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-29 21:46:17.000000000 +0200
 @@ -31,6 +31,7 @@
  
  #include "rcsid.h"
@@ -147,9 +147,9 @@
  
  	/*
  	 * Get the user's real name. The current UID is used to determine
-@@ -624,6 +660,23 @@
- 			 oldname[0] ? oldname : "???", name[0] ? name : "???"));
- #endif
+@@ -509,6 +545,23 @@
+ 	if (pwent.pw_shell[0] == '\0')
+ 		pwent.pw_shell = "/bin/sh";	/* XXX warning: const */
  
 +	/* If the user do not want to change the environment,
 +	 * use the current SHELL.
@@ -168,9 +168,9 @@
 +	if (shell == 0)
 +		shell = (char *) strdup (pwent.pw_shell);
 +
+ 	signal (SIGINT, SIG_IGN);
+ 	signal (SIGQUIT, SIG_IGN);
  #ifdef USE_PAM
- 	/* set primary group id and supplementary groups */
- 	if (setup_groups (&pwent)) {
 @@ -687,7 +740,7 @@
  	else {
  		addenv ("HOME", pwent.pw_dir);