[Pkg-sysvinit-commits] r387 - sysvinit/trunk/debian/patches

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-15 22:53:59 +0000 (Thu, 15 Dec 2005)
New Revision: 387

Added:
   sysvinit/trunk/debian/patches/92_sulogin_sash.dpatch
Modified:
   sysvinit/trunk/debian/patches/00list
Log:
Add patch 92

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2005-12-15 15:55:12 UTC (rev 386)
+++ sysvinit/trunk/debian/patches/00list	2005-12-15 22:53:59 UTC (rev 387)
@@ -21,3 +21,4 @@
 81_killall_avoid_init
 90_shutdown_H
 91_sulogin_lockedpw
+92_sulogin_sash

Added: sysvinit/trunk/debian/patches/92_sulogin_sash.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/92_sulogin_sash.dpatch	2005-12-15 15:55:12 UTC (rev 386)
+++ sysvinit/trunk/debian/patches/92_sulogin_sash.dpatch	2005-12-15 22:53:59 UTC (rev 387)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_sulogin_sash.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Try sash if sh fails
+
+ at DPATCH@
+Index: sysvinit/src/sulogin.c
+===================================================================
+--- sysvinit/src/sulogin.c_ORIG	2005-12-02 17:22:57.000000000 +0100
++++ sysvinit/src/sulogin.c	2005-12-16 00:49:34.000000000 +0100
+@@ -34,6 +34,7 @@
+ #define F_PASSWD	"/etc/passwd"
+ #define F_SHADOW	"/etc/shadow"
+ #define BINSH		"/bin/sh"
++#define STATICSH	"/bin/sash"
+ 
+ char *Version = "@(#)sulogin 2.85-3 23-Apr-2003 miquels at cistron.nl";
+ 
+@@ -331,16 +332,21 @@
+ 	/*
+ 	 *	Try to execute a shell.
+ 	 */
+-	setenv("SHELL", sushell, 1);
+ 	signal(SIGINT, SIG_DFL);
+ 	signal(SIGTSTP, SIG_DFL);
+ 	signal(SIGQUIT, SIG_DFL);
++
++	setenv("SHELL", sushell, 1);
+ 	execl(sushell, shell, NULL);
+ 	perror(sushell);
+ 
+ 	setenv("SHELL", BINSH, 1);
+ 	execl(BINSH, profile ? "-sh" : "sh", NULL);
+ 	perror(BINSH);
++
++	setenv("SHELL", STATICSH, 1);
++	execl(STATICSH, STATICSH, NULL);
++	perror(STATICSH);
+ }
+ 
+ void usage(void)


Property changes on: sysvinit/trunk/debian/patches/92_sulogin_sash.dpatch
___________________________________________________________________
Name: svn:executable
   + *