diff options
| author | Assar Westerlund <assar@FreeBSD.org> | 2001-03-12 03:54:48 +0000 |
|---|---|---|
| committer | Assar Westerlund <assar@FreeBSD.org> | 2001-03-12 03:54:48 +0000 |
| commit | bb330cd01ef4b0f937221d9c294e4679cb0bf892 (patch) | |
| tree | d766c356735bb05a30edde17e0192069a7c6ff1b | |
| parent | 1d4589b693e395345032db256799b0dd6a94e1b9 (diff) | |
Notes
| -rw-r--r-- | contrib/telnet/telnet/main.c | 13 | ||||
| -rw-r--r-- | crypto/telnet/telnet/main.c | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c index c3d0f5d74ba9..ce3378594b0f 100644 --- a/contrib/telnet/telnet/main.c +++ b/contrib/telnet/telnet/main.c @@ -284,6 +284,8 @@ main(argc, argv) break; case 'l': autologin = 1; + if(autologin == 0) + autologin = -1; user = optarg; break; case 'n': @@ -344,6 +346,17 @@ main(argc, argv) /* NOTREACHED */ } } + + if (autologin == -1) { /* esc@magic.fi; force */ +#if defined(AUTHENTICATION) + autologin = 1; +#endif +#if defined(ENCRYPTION) + encrypt_auto(1); + decrypt_auto(1); +#endif + } + if (autologin == -1) autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1; diff --git a/crypto/telnet/telnet/main.c b/crypto/telnet/telnet/main.c index c3d0f5d74ba9..ce3378594b0f 100644 --- a/crypto/telnet/telnet/main.c +++ b/crypto/telnet/telnet/main.c @@ -284,6 +284,8 @@ main(argc, argv) break; case 'l': autologin = 1; + if(autologin == 0) + autologin = -1; user = optarg; break; case 'n': @@ -344,6 +346,17 @@ main(argc, argv) /* NOTREACHED */ } } + + if (autologin == -1) { /* esc@magic.fi; force */ +#if defined(AUTHENTICATION) + autologin = 1; +#endif +#if defined(ENCRYPTION) + encrypt_auto(1); + decrypt_auto(1); +#endif + } + if (autologin == -1) autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1; |