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

	Just call ttytype.

diff --git a/ChangeLog b/ChangeLog
index de02729a6d1b4ddd052c7b2d45408b29e7e05276..746b0245b1dab4c73bc038830eec7b021f4f1805 100644 (file)
--- 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 b31a9f80536fd29560d681e9208400f38ce6cf21..58137fb27405b1f4eb55746553f60e09779a00f7 100644 (file)
--- 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 */