From: Dave Reisner <d@falconindy.com>
Date: Tue, 28 Feb 2012 16:45:17 +0000 (-0500)
Subject: sulogin: get rid of calls to /bin/sash
X-Git-Tag: v2.22-rc1~693
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1619c88d3221d3587eea0aaf0415f2244da9a4f;p=thirdparty%2Futil-linux.git

sulogin: get rid of calls to /bin/sash

This probably doesn't exist on most systems, and if the root's shell and
/bin/sh fail to execute, it seems unlikely that /bin/sash will save us.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index c9e376c43e..f672e7531c 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -54,7 +54,6 @@
 #define F_PASSWD	"/etc/passwd"
 #define F_SHADOW	"/etc/shadow"
 #define BINSH		"/bin/sh"
-#define STATICSH	"/bin/sash"
 
 static int timeout;
 static int profile;
@@ -400,12 +399,6 @@ static void sushell(struct passwd *pwd)
 	setenv("SHELL", BINSH, 1);
 	execl(BINSH, profile ? "-sh" : "sh", NULL);
 	perror(BINSH);
-
-	/* Fall back to staticly linked shell if both the users shell
-	   and /bin/sh failed to execute. */
-	setenv("SHELL", STATICSH, 1);
-	execl(STATICSH, STATICSH, NULL);
-	perror(STATICSH);
 }
 
 static void usage(void)