From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 20 Apr 2009 13:12:09 +0000 (+0000)
Subject: 	* src/login.c: ttytype already checks for TTYTYPE_FILE and TERM.
X-Git-Tag: 4.1.4~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ac4dda75340dfd1640a639e38593f46aa870ed;p=thirdparty%2Fshadow.git

	* src/login.c: ttytype already checks for TTYTYPE_FILE and TERM.
	Just call ttytype.
---

diff --git a/ChangeLog b/ChangeLog
index de02729a6..746b0245b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-20  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/login.c: ttytype already checks for TTYTYPE_FILE and TERM.
+	Just call ttytype.
+
 2009-04-20  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/login.c: Open the PAM session before pam_setcred and before
diff --git a/src/login.c b/src/login.c
index b31a9f805..58137fb27 100644
--- a/src/login.c
+++ b/src/login.c
@@ -1272,10 +1272,7 @@ int main (int argc, char **argv)
 		addenv ("HUSHLOGIN=TRUE", NULL);
 	}
 
-	if (   (NULL != getdef_str ("TTYTYPE_FILE"))
-	    && (NULL == getenv ("TERM"))) {
-		ttytype (tty);
-	}
+	ttytype (tty);
 
 	(void) signal (SIGQUIT, SIG_DFL);	/* default quit signal */
 	(void) signal (SIGTERM, SIG_DFL);	/* default terminate signal */