[Pkg-shadow-commits] r2726 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-20 13:12:09 +0000 (Mon, 20 Apr 2009)
New Revision: 2726

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login.c
Log:
	* src/login.c: ttytype already checks for TTYTYPE_FILE and TERM.
	Just call ttytype.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-20 13:10:20 UTC (rev 2725)
+++ upstream/trunk/ChangeLog	2009-04-20 13:12:09 UTC (rev 2726)
@@ -1,5 +1,10 @@
 2009-04-20  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/login.c: ttytype already checks for TTYTYPE_FILE and TERM.
+	Just call ttytype.
+
+2009-04-20  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/login.c: Open the PAM session before pam_setcred and before
 	initgroups. This is more consistent with rfc86.0.
 

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2009-04-20 13:10:20 UTC (rev 2725)
+++ upstream/trunk/src/login.c	2009-04-20 13:12:09 UTC (rev 2726)
@@ -1272,10 +1272,7 @@
 		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 */