Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix spelling of cpp symbol (ENCRYPT vs ENCRYPTION). 

enable encryption with autologin.
fixes PR 12226
This commit is contained in:
assar 2001-03-04 01:51:05 +00:00
parent 5d1d7ca9ca
commit 93963c8db2
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/telnet/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.14 2001/01/03 12:41:00 mjl Exp $ */
/* $NetBSD: main.c,v 1.15 2001/03/04 01:51:05 assar Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: main.c,v 1.14 2001/01/03 12:41:00 mjl Exp $");
__RCSID("$NetBSD: main.c,v 1.15 2001/03/04 01:51:05 assar Exp $");
#endif
#endif /* not lint */
@ -269,7 +269,9 @@ main(argc, argv)
#endif
break;
case 'l':
autologin = 1;
if(autologin == 0) {
autologin = -1;
}
user = optarg;
break;
case 'n':
@ -327,6 +329,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;

8
usr.bin/telnet/telnet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: telnet.c,v 1.16 2000/06/22 06:47:48 thorpej Exp $ */
/* $NetBSD: telnet.c,v 1.17 2001/03/04 01:51:05 assar Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
#else
__RCSID("$NetBSD: telnet.c,v 1.16 2000/06/22 06:47:48 thorpej Exp $");
__RCSID("$NetBSD: telnet.c,v 1.17 2001/03/04 01:51:05 assar Exp $");
#endif
#endif /* not lint */
@ -427,10 +427,10 @@ willoption(option)
}
}
set_my_state_do(option);
#ifdef ENCRYPT
#ifdef ENCRYPTION
if (option == TELOPT_ENCRYPT)
encrypt_send_support();
#endif /* ENCRYPT */
#endif /* ENCRYPTION */
}
void