From a6ac4dda75340dfd1640a639e38593f46aa870ed Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 20 Apr 2009 13:12:09 +0000 Subject: [PATCH] * src/login.c: ttytype already checks for TTYTYPE_FILE and TERM. Just call ttytype. --- ChangeLog | 5 +++++ src/login.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index de02729a..746b0245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-20 Nicolas François + + * src/login.c: ttytype already checks for TTYTYPE_FILE and TERM. + Just call ttytype. + 2009-04-20 Nicolas François * src/login.c: Open the PAM session before pam_setcred and before diff --git a/src/login.c b/src/login.c index b31a9f80..58137fb2 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 */