diff options
| author | nsayer <nsayer@FreeBSD.org> | 2001-04-05 14:09:15 +0000 |
|---|---|---|
| committer | nsayer <nsayer@FreeBSD.org> | 2001-04-05 14:09:15 +0000 |
| commit | 66051d03dc660060ca561db94e51996f1bfe8d89 (patch) | |
| tree | bef83692314537941c7712a6bc741e923fa41b7a | |
| parent | 938fa0f26ba95dab039bd28edf94c4ed0dd165bf (diff) | |
| download | FreeBSD-src-66051d03dc660060ca561db94e51996f1bfe8d89.zip FreeBSD-src-66051d03dc660060ca561db94e51996f1bfe8d89.tar.gz | |
Reactivate SRA.
Make handling of SIGINT and SIGQUIT follow SIGTSTP in TerminalNewMode().
This allows people to break out of SRA authentication if they wish to.
| -rw-r--r-- | contrib/telnet/telnet/sys_bsd.c | 18 | ||||
| -rw-r--r-- | crypto/telnet/telnet/sys_bsd.c | 18 | ||||
| -rw-r--r-- | secure/lib/libtelnet/Makefile | 4 |
3 files changed, 38 insertions, 2 deletions
diff --git a/contrib/telnet/telnet/sys_bsd.c b/contrib/telnet/telnet/sys_bsd.c index aac7c6a..1d63c22 100644 --- a/contrib/telnet/telnet/sys_bsd.c +++ b/contrib/telnet/telnet/sys_bsd.c @@ -616,6 +616,12 @@ TerminalNewMode(f) } if (f != -1) { +#ifdef SIGINT + SIG_FUNC_RET intr(); +#endif /* SIGINT */ +#ifdef SIGQUIT + SIG_FUNC_RET intr2(); +#endif /* SIGQUIT */ #ifdef SIGTSTP SIG_FUNC_RET susp(); #endif /* SIGTSTP */ @@ -623,6 +629,12 @@ TerminalNewMode(f) SIG_FUNC_RET ayt(); #endif +#ifdef SIGINT + (void) signal(SIGINT, intr); +#endif +#ifdef SIGQUIT + (void) signal(SIGQUIT, intr2); +#endif #ifdef SIGTSTP (void) signal(SIGTSTP, susp); #endif /* SIGTSTP */ @@ -673,6 +685,12 @@ TerminalNewMode(f) (void) signal(SIGINFO, ayt_status); #endif +#ifdef SIGINT + (void) signal(SIGINT, SIG_DFL); +#endif +#ifdef SIGQUIT + (void) signal(SIGQUIT, SIG_DFL); +#endif #ifdef SIGTSTP (void) signal(SIGTSTP, SIG_DFL); # ifndef SOLARIS diff --git a/crypto/telnet/telnet/sys_bsd.c b/crypto/telnet/telnet/sys_bsd.c index aac7c6a..1d63c22 100644 --- a/crypto/telnet/telnet/sys_bsd.c +++ b/crypto/telnet/telnet/sys_bsd.c @@ -616,6 +616,12 @@ TerminalNewMode(f) } if (f != -1) { +#ifdef SIGINT + SIG_FUNC_RET intr(); +#endif /* SIGINT */ +#ifdef SIGQUIT + SIG_FUNC_RET intr2(); +#endif /* SIGQUIT */ #ifdef SIGTSTP SIG_FUNC_RET susp(); #endif /* SIGTSTP */ @@ -623,6 +629,12 @@ TerminalNewMode(f) SIG_FUNC_RET ayt(); #endif +#ifdef SIGINT + (void) signal(SIGINT, intr); +#endif +#ifdef SIGQUIT + (void) signal(SIGQUIT, intr2); +#endif #ifdef SIGTSTP (void) signal(SIGTSTP, susp); #endif /* SIGTSTP */ @@ -673,6 +685,12 @@ TerminalNewMode(f) (void) signal(SIGINFO, ayt_status); #endif +#ifdef SIGINT + (void) signal(SIGINT, SIG_DFL); +#endif +#ifdef SIGQUIT + (void) signal(SIGQUIT, SIG_DFL); +#endif #ifdef SIGTSTP (void) signal(SIGTSTP, SIG_DFL); # ifndef SOLARIS diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 4ed638a..4eda977 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -7,10 +7,10 @@ INTERNALSTATICLIB=yes NOPIC= yes SRCS= genget.c getent.c misc.c encrypt.c auth.c \ - enc_des.c pk.c + enc_des.c sra.c pk.c CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ - -I${TELNETDIR} + -DSRA -I${TELNETDIR} INCS= ${TELNETDIR}/arpa/telnet.h INCDIR= /usr/include/arpa |
