|
 |
868f7a8 |
diff -up mgetty-1.1.36/logfile.c.162174_tcflush mgetty-1.1.36/logfile.c
|
|
|
868f7a8 |
--- mgetty-1.1.36/logfile.c.162174_tcflush 2008-10-09 22:57:07.000000000 +0200
|
|
|
868f7a8 |
+++ mgetty-1.1.36/logfile.c 2008-10-09 22:57:07.000000000 +0200
|
|
jvdias |
cfec38b |
@@ -22,6 +22,7 @@
|
|
jvdias |
cfec38b |
#endif
|
|
jvdias |
cfec38b |
|
|
jvdias |
cfec38b |
#ifdef SYSLOG
|
|
jvdias |
cfec38b |
+#include <signal.h>
|
|
jvdias |
cfec38b |
#include <syslog.h>
|
|
jvdias |
cfec38b |
|
|
jvdias |
cfec38b |
#if !defined(linux) && !defined(BSD) && !defined(_SCO_DS) && \
|
|
|
868f7a8 |
@@ -212,6 +213,7 @@ va_list pvar;
|
|
jvdias |
cfec38b |
int errnr;
|
|
jvdias |
cfec38b |
char * p;
|
|
jvdias |
cfec38b |
static int first_open = TRUE;
|
|
jvdias |
cfec38b |
+sigset_t ss, oss;
|
|
jvdias |
cfec38b |
|
|
jvdias |
cfec38b |
if ( level > log_level ) /* log level high enough? */
|
|
jvdias |
cfec38b |
{
|
|
|
868f7a8 |
@@ -315,7 +317,24 @@ static int first_open = TRUE;
|
|
jvdias |
cfec38b |
tm->tm_mon+1, tm->tm_mday,
|
|
jvdias |
cfec38b |
tm->tm_hour, tm->tm_min, tm->tm_sec, ws );
|
|
jvdias |
cfec38b |
#ifdef SYSLOG
|
|
jvdias |
cfec38b |
+ /* block all handled signals before syslog(), else an lprintf in
|
|
jvdias |
cfec38b |
+ * a signal handler could deadlock
|
|
jvdias |
cfec38b |
+ */
|
|
jvdias |
cfec38b |
+ sigemptyset(&ss);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGALRM);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGCHLD);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGHUP);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGINT);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGPIPE);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGQUIT);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGTERM);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGUSR1);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGUSR2);
|
|
jvdias |
cfec38b |
+ sigprocmask(SIG_BLOCK, &ss, &oss;;
|
|
jvdias |
cfec38b |
+
|
|
jvdias |
cfec38b |
syslog( LOG_NOTICE, "%s", ws );
|
|
jvdias |
cfec38b |
+
|
|
jvdias |
cfec38b |
+ sigprocmask(SIG_SETMASK, &oss, 0L);
|
|
jvdias |
cfec38b |
#endif
|
|
jvdias |
cfec38b |
}
|
|
jvdias |
cfec38b |
else if ( level != L_ERROR && level != L_FATAL )
|
|
|
868f7a8 |
@@ -334,7 +353,21 @@ static int first_open = TRUE;
|
|
jvdias |
cfec38b |
( errnr <= sys_nerr ) ? sys_errlist[errnr]:
|
|
jvdias |
cfec38b |
"<error not in list>" );
|
|
jvdias |
cfec38b |
#ifdef SYSLOG
|
|
jvdias |
cfec38b |
+ sigemptyset(&ss);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGALRM);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGCHLD);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGHUP);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGINT);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGPIPE);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGQUIT);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGTERM);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGUSR1);
|
|
jvdias |
cfec38b |
+ sigaddset(&ss, SIGUSR2);
|
|
jvdias |
cfec38b |
+ sigprocmask(SIG_BLOCK, &ss, &oss;;
|
|
jvdias |
cfec38b |
+
|
|
jvdias |
cfec38b |
syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
|
|
jvdias |
cfec38b |
+
|
|
jvdias |
cfec38b |
+ sigprocmask(SIG_SETMASK, &oss, 0L);
|
|
jvdias |
cfec38b |
#endif
|
|
jvdias |
cfec38b |
|
|
jvdias |
cfec38b |
#ifndef SYSLOG
|
|
|
868f7a8 |
diff -up mgetty-1.1.36/logname.c.162174_tcflush mgetty-1.1.36/logname.c
|
|
|
868f7a8 |
--- mgetty-1.1.36/logname.c.162174_tcflush 2008-10-09 22:57:07.000000000 +0200
|
|
|
868f7a8 |
+++ mgetty-1.1.36/logname.c 2008-10-09 22:57:07.000000000 +0200
|
|
|
868f7a8 |
@@ -381,10 +381,12 @@ int getlogname _P7( (prompt, tio, buf, m
|
|
|
868f7a8 |
{
|
|
|
868f7a8 |
printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
|
|
|
868f7a8 |
(max_login_time / 60)+1 );
|
|
|
868f7a8 |
-
|
|
|
868f7a8 |
+ signal(SIGALRM,SIG_DFL);/* turn off alarm */
|
|
|
868f7a8 |
+ alarm(0);
|
|
|
868f7a8 |
sleep(3); /* give message time to xmit */
|
|
|
868f7a8 |
lprintf( L_AUDIT, "failed dev=%s, pid=%d, login time out",
|
|
|
868f7a8 |
Device, getpid() );
|
|
|
868f7a8 |
+ tcflush(1,TCOFLUSH); /* allow us to exit without hanging (bug 164002) */
|
|
|
868f7a8 |
exit(0); /* bye bye... */
|
|
|
868f7a8 |
}
|
|
|
868f7a8 |
ch = CKILL; /* timeout #1 -> clear input */
|
|
|
868f7a8 |
diff -up mgetty-1.1.36/mgetty.c.162174_tcflush mgetty-1.1.36/mgetty.c
|
|
|
868f7a8 |
--- mgetty-1.1.36/mgetty.c.162174_tcflush 2008-10-09 22:57:07.000000000 +0200
|
|
|
868f7a8 |
+++ mgetty-1.1.36/mgetty.c 2008-10-09 22:57:07.000000000 +0200
|
|
|
868f7a8 |
@@ -103,6 +103,7 @@ static RETSIGTYPE sig_goodbye _P1 ( (sig
|
|
|
868f7a8 |
lprintf( L_AUDIT, "failed dev=%s, pid=%d, got signal %d, exiting",
|
|
|
868f7a8 |
Device, getpid(), signo );
|
|
|
868f7a8 |
rmlocks();
|
|
|
868f7a8 |
+ tcflush(1,TCOFLUSH);
|
|
|
868f7a8 |
exit(10);
|
|
|
868f7a8 |
}
|
|
|
868f7a8 |
|