summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-06-02 07:51:38 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-06-02 07:51:38 +0000
commit34c853f11ba47230ec898c78770f504dccee68c9 (patch)
treeca1791a4e7a495923c6a0f70197efe7c2b2ec19d
parent2d0cfec5a1577b87a369ef243488dcabb02d66e9 (diff)
remove references to telnetd(8);
ok deraadt@
-rw-r--r--share/man/man4/pty.49
-rw-r--r--usr.bin/login/login.112
-rw-r--r--usr.sbin/faithd/faithd.818
-rw-r--r--usr.sbin/inetd/inetd.83
4 files changed, 8 insertions, 34 deletions
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index c949b70bab4..73e7b46d0a2 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pty.4,v 1.16 2004/11/25 16:41:55 jmc Exp $
+.\" $OpenBSD: pty.4,v 1.17 2005/06/02 07:51:37 jmc Exp $
.\" $NetBSD: pty.4,v 1.4 1998/03/21 03:14:30 fair Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -151,11 +151,8 @@ is a copy of the new
.Xr termios 4
structure.
.Pp
-This is used by
-.Xr telnetd 8
-to implement TELNET "line mode" - it allows the
-.Xr telnetd 8
-to detect
+This is used by telnet daemons to implement TELNET "line mode",
+allowing them to detect
.Xr tty 4
state changes by the slave, and negotiate the appropriate TELNET
protocol equivalents with the remote peer.
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index b5fbf8d524e..3b82b8ad546 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login.1,v 1.23 2004/08/09 21:18:19 millert Exp $
+.\" $OpenBSD: login.1,v 1.24 2005/06/02 07:51:37 jmc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -74,14 +74,11 @@ This option may only be used by the superuser or when an already
logged in user is logging in as themselves.
.It Fl h Ar hostname
Specifies the host from which the connection was received.
-It is used by various daemons such as
-.Xr telnetd 8 .
This option may only be used by the superuser.
.It Fl L
The
.Fl L
-option specifies the local IP address of a socket such as telnetd
-would use.
+option specifies the local IP address of a socket.
This information is passed on to any classify script (see
.Xr login.conf 5 ) .
.It Fl p
@@ -94,14 +91,11 @@ option disables this behavior.
.It Fl R
The
.Fl R
-option specifies the remote IP address of a socket such as telnetd
-would use.
+option specifies the remote IP address of a socket.
This information is passed on to any classify script (see
.Xr login.conf 5 ) .
.It Fl u Ar username
Specifies the remote user that initiated the connection.
-It is used by various daemons such as
-.Xr telnetd 8 .
This option may only be used by the superuser.
.El
.Pp
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index f9932e5d0c8..83e4566a980 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: faithd.8,v 1.29 2005/03/01 22:04:35 jmc Exp $
+.\" $OpenBSD: faithd.8,v 1.30 2005/06/02 07:51:37 jmc Exp $
.\" $KAME: faithd.8,v 1.36 2002/05/09 13:59:16 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -271,25 +271,9 @@ as follows:
.Pp
.Dl # faithd telnet
.Pp
-Provide local telnet service via
-.Xr telnetd 8
-using
-.Pa /usr/libexec/telnetd :
-.Pp
-.Dl # faithd telnet /usr/libexec/telnetd telnetd
-.Pp
Pass extra arguments to the local daemon:
.Pp
.Dl # faithd ftp /usr/libexec/ftpd ftpd -l
-.Pp
-Here are some other examples.
-If the service checks the source port range,
-.Fl p
-may be required.
-.Bd -literal -offset indent
-# faithd ssh
-# faithd telnet /usr/libexec/telnetd telnetd
-.Ed
.Ss Access control samples
The following illustrates a simple
.Pa faithd.conf
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index b92bcfa1dbb..2d3fef1f4d0 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: inetd.8,v 1.27 2004/06/30 07:58:12 otto Exp $
+.\" $OpenBSD: inetd.8,v 1.28 2005/06/02 07:51:37 jmc Exp $
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -380,7 +380,6 @@ only IPv6 traffic will be routed to the server.
.Xr identd 8 ,
.Xr rshd 8 ,
.Xr talkd 8 ,
-.Xr telnetd 8 ,
.Xr tftpd 8
.Sh HISTORY
The