delete SecurID hacks

4 files changed, 7 insertions, 52 deletions

diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index 6fe7890e917..21a5a62f92f 100644
--- a/libexec/telnetd/ext.h
+++ b/libexec/telnetd/ext.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext.h,v 1.6 1998/05/08 19:37:45 deraadt Exp $	*/
+/*	$OpenBSD: ext.h,v 1.7 1998/07/23 17:55:50 deraadt Exp $	*/
 /*	$NetBSD: ext.h,v 1.6 1996/02/28 20:38:13 thorpej Exp $	*/
 
 /*
@@ -60,9 +60,6 @@ extern int	diagnostic;	/* telnet diagnostic capabilities */
 #ifdef BFTPDAEMON
 extern int	bftpd;		/* behave as bftp daemon */
 #endif /* BFTPDAEMON */
-#if	defined(SecurID)
-extern int	require_SecurID;
-#endif
 #if	defined(AUTHENTICATION)
 extern int	auth_level;
 #endif
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index 18ed3134286..0887e9df0a0 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_term.c,v 1.15 1998/07/13 02:11:20 millert Exp $	*/
+/*	$OpenBSD: sys_term.c,v 1.16 1998/07/23 17:55:51 deraadt Exp $	*/
 /*	$NetBSD: sys_term.c,v 1.9 1996/03/20 04:25:53 tls Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sys_term.c	8.4+1 (Berkeley) 5/30/95";
 static char rcsid[] = "$NetBSD: sys_term.c,v 1.8 1996/02/28 20:38:21 thorpej Exp $";
 #else
-static char rcsid[] = "$OpenBSD: sys_term.c,v 1.15 1998/07/13 02:11:20 millert Exp $";
+static char rcsid[] = "$OpenBSD: sys_term.c,v 1.16 1998/07/23 17:55:51 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -1661,14 +1661,6 @@ start_login(host, autologin, name)
 		argv = addarg(argv, BFTPPATH);
 	} else
 #endif
-#if	defined (SecurID)
-	/*
-	 * don't worry about the -f that might get sent.
-	 * A -s is supposed to override it anyhow.
-	 */
-	if (require_SecurID)
-		argv = addarg(argv, "-s");
-#endif
 #if	defined (AUTHENTICATION)
 	if (auth_level >= 0 && autologin == AUTH_VALID) {
 # if	!defined(NO_LOGIN_F)
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index be5dedc4e66..ed306f2d829 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnetd.8,v 1.5 1998/06/15 17:55:39 mickey Exp $
+.\"	$OpenBSD: telnetd.8,v 1.6 1998/07/23 17:55:53 deraadt Exp $
 .\"	$NetBSD: telnetd.8,v 1.8 1996/03/20 04:25:55 tls Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@
 protocol server
 .Sh SYNOPSIS
 .Nm /usr/libexec/telnetd
-.Op Fl Uhlkns
+.Op Fl Uhlkn
 .Op Fl D Ar debugmode
 .Op Fl I Ns Ar initid
 .Op Fl S Ar tos
@@ -271,25 +271,6 @@ can differentiate
 .Ar highpty
 from
 .Ar lowpty .
-.It Fl s
-This option is only enabled if
-.Nm telnetd
-is compiled with support for
-.Tn SecurID
-cards.
-It causes the
-.Fl s
-option to be passed on to
-.Xr login 1 ,
-and thus is only useful if
-.Xr login 1
-supports the
-.Fl s
-flag to indicate that only
-.Tn SecurID
-validated logins are allowed, and is
-usually useful for controlling remote logins
-from outside of a firewall.
 .It Fl S Ar tos
 .It Fl u Ar len
 This option is used to specify the size of the field
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 89bcaf1116f..455c5300b9b 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: telnetd.c,v 1.12 1998/05/08 19:37:50 deraadt Exp $	*/
+/*	$OpenBSD: telnetd.c,v 1.13 1998/07/23 17:55:54 deraadt Exp $	*/
 /*	$NetBSD: telnetd.c,v 1.6 1996/03/20 04:25:57 tls Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
 static char rcsid[] = "$NetBSD: telnetd.c,v 1.5 1996/02/28 20:38:23 thorpej Exp $";
 #else
-static char rcsid[] = "$OpenBSD: telnetd.c,v 1.12 1998/05/08 19:37:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: telnetd.c,v 1.13 1998/07/23 17:55:54 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -96,9 +96,6 @@ int	auth_level = 0;
 #include <libtelnet/encrypt.h>
 #include <libtelnet/misc-proto.h>
 #endif
-#if	defined(SecurID)
-int	require_SecurID = 0;
-#endif
 
 extern	int utmp_len;
 int	registerd_host_only = 0;
@@ -174,9 +171,6 @@ char valid_opts[] = {
 #ifdef CRAY
 	'r', ':',
 #endif
-#ifdef	SecurID
-	's',
-#endif
 	'\0'
 };
 
@@ -345,12 +339,6 @@ main(argc, argv)
 		    }
 #endif	/* CRAY */
 
-#ifdef	SecurID
-		case 's':
-			/* SecurID required */
-			require_SecurID = 1;
-			break;
-#endif	/* SecurID */
 		case 'S':
 #ifdef	HAS_GETTOS
 			if ((tos = parsetos(optarg, "tcp")) < 0)
@@ -578,9 +566,6 @@ usage()
 	fprintf(stderr, " [-r[lowpty]-[highpty]]");
 #endif
 	fprintf(stderr, "\n\t");
-#ifdef	SecurID
-	fprintf(stderr, " [-s]");
-#endif
 #ifdef	HAS_GETTOS
 	fprintf(stderr, " [-S tos]");
 #endif