more, mostly whitespace, fixes from Thomas Klasusner

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11176 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-08-20 17:07:29 +00:00
parent 747a00df69
commit 879fc6b8bc
46 changed files with 402 additions and 401 deletions

View File

@@ -923,10 +923,10 @@ A synonym for help.
The following command can be used with ftpsec-aware servers.
.Bl -tag -width Fl
.It Xo
.Ic prot
.Ar clear |
.Ar safe |
.Ar confidential |
.Ic prot
.Ar clear |
.Ar safe |
.Ar confidential |
.Ar private
.Xc
Set the data protection level to the requested level.

View File

@@ -44,7 +44,7 @@
.Op Fl a Ar authmode
.Op Fl dilvU
.Op Fl g Ar umask
.Op Fl p Ar port
.Op Fl p Ar port
.Op Fl T Ar maxtimeout
.Op Fl t Ar timeout
.Op Fl u Ar default umask
@@ -89,7 +89,7 @@ The following combination modes exists for backwards compatibility:
Same as
.Ar plain,ftp .
.It Ar safe
Same as
Same as
.Ar ftp .
.It Ar user
Ignored.
@@ -103,7 +103,7 @@ Anonymous users will get a umask of
Open a socket and wait for a connection. This is mainly used for
debugging when ftpd isn't started by inetd.
.It Fl l
Each successful and failed
Each successful and failed
.Xr ftp 1
session is logged using syslog with a facility of LOG_FTP.
If this option is specified twice, the retrieve (get), store (put), append,
@@ -112,7 +112,7 @@ their filename arguments are also logged.
.It Fl p
Use
.Ar port
(a service name or number) instead of the default
(a service name or number) instead of the default
.Ar ftp/tcp .
.It Fl T
A client may also request a different timeout period;
@@ -131,11 +131,11 @@ Set the initial umask to something else than the default 027.
.It Fl U
In previous versions of
.Nm ftpd ,
when a passive mode client requested a data connection to the server, the
server would use data ports in the range 1024..4999. Now, by default,
when a passive mode client requested a data connection to the server, the
server would use data ports in the range 1024..4999. Now, by default,
if the system supports the IP_PORTRANGE socket option, the server will
use data ports in the range 49152..65535. Specifying this option will
revert to the old behavior.
revert to the old behavior.
.It Fl v
Verbose mode.
.It Xo
@@ -159,7 +159,7 @@ If the file
.Pa /etc/ftpwelcome
exists,
.Nm
prints it before issuing the
prints it before issuing the
.Dq ready
message.
If the file
@@ -231,13 +231,13 @@ by the
SITE request.
.Pp
.Bl -column Request -offset indent
.It UMASK Ta change umask, (e.g.
.It UMASK Ta change umask, (e.g.
.Ic "SITE UMASK 002" )
.It IDLE Ta set idle-timer, (e.g.
.It IDLE Ta set idle-timer, (e.g.
.Ic "SITE IDLE 60" )
.It CHMOD Ta change mode of a file (e.g.
.It CHMOD Ta change mode of a file (e.g.
.Ic "SITE CHMOD 755 filename" )
.It FIND Ta quickly find a specific file with GNU
.It FIND Ta quickly find a specific file with GNU
.Xr locate 1 .
.It HELP Ta give help information.
.El
@@ -273,7 +273,7 @@ This allows users to utilize the metacharacters
.Dq Li \&*?[]{}~ .
.Pp
.Nm Ftpd
authenticates users according to these rules.
authenticates users according to these rules.
.Pp
.Bl -enum -offset indent
.It
@@ -295,7 +295,7 @@ for more information on OTP authentication.
The login name must not appear in the file
.Pa /etc/ftpusers .
.It
The user must have a standard shell returned by
The user must have a standard shell returned by
.Xr getusershell 3 .
.It
If the user name appears in the file
@@ -307,7 +307,7 @@ as for an
or
.Dq ftp
account (see next item). However, the user must still supply a password.
This feature is intended as a compromise between a fully anonymous account
This feature is intended as a compromise between a fully anonymous account
and a fully privileged account. The account should also be set up as for an
anonymous account.
.It
@@ -324,10 +324,10 @@ to log in by specifying any password (by convention an email address for
the user should be used as the password).
.El
.Pp
In the last case,
In the last case,
.Nm ftpd
takes special measures to restrict the client's access privileges.
The server performs a
The server performs a
.Xr chroot 2
to the home directory of the
.Dq ftp
@@ -348,14 +348,14 @@ file). No files should be owned or writable by
as specified below).
.Bl -tag -width "~ftp/pub" -offset indent
.It Pa ~ftp
The
The
.Dq ftp
homedirectory should be owned by root.
.It Pa ~ftp/bin
The directory for external programs (such as
The directory for external programs (such as
.Xr ls 1 ) .
These programs must either be statically linked, or you must setup an
environment for dynamic linking when running chrooted.
environment for dynamic linking when running chrooted.
These programs will be used if present:
.Bl -tag -width "locate" -offset indent
.It ls
@@ -376,30 +376,30 @@ Enables retrieval of whole directories as files ending in
.Pa .tar .
Can also be combined with compression. You must use GNU Tar (or some
other that supports the
.Fl z
.Fl z
and
.Fl Z
flags).
.It locate
Will enable ``fast find'' with the
Will enable ``fast find'' with the
.Ic SITE FIND
command. You must also create a
command. You must also create a
.Pa locatedb
file in
file in
.Pa ~ftp/etc .
.El
.It Pa ~ftp/etc
If you put copies of the
.Xr passwd 5
and
and
.Xr group 5
files here, ls will be able to produce owner names rather than
numbers. Remember to remove any passwords from these files.
numbers. Remember to remove any passwords from these files.
.Pp
The file
.Pa motd ,
if present, will be printed after a successful login.
.It Pa ~ftp/dev
.It Pa ~ftp/dev
Put a copy of
.Xr /dev/null 7
here.
@@ -409,12 +409,12 @@ Traditional place to put whatever you want to make public.
.Pp
If you want guests to be able to upload files, create a
.Pa ~ftp/incoming
directory owned by
directory owned by
.Dq root ,
and group
.Dq ftp
with mode 730 (make sure
.Dq ftp
with mode 730 (make sure
.Dq ftp
is member of group
.Dq ftp ) .
The following restrictions apply to anonymous users:
@@ -427,25 +427,25 @@ with the
.Fl g
option.
.It
These command are not accessible:
.Ic DELE , RMD , RNTO , RNFR ,
These command are not accessible:
.Ic DELE , RMD , RNTO , RNFR ,
.Ic SITE UMASK ,
and
.Ic SITE CHMOD .
.It
Filenames must start with an alpha-numeric character, and consist of
alpha-numeric characters or any of the following:
.Li \&+
alpha-numeric characters or any of the following:
.Li \&+
(plus),
.Li \&-
.Li \&-
(minus),
.Li \&=
.Li \&=
(equal),
.Li \&_
.Li \&_
(underscore),
.Li \&.
.Li \&.
(period), and
.Li \&,
.Li \&,
(comma).
.El
.Sh FILES

View File

@@ -10,7 +10,7 @@
.Pa /etc/ftpusers
contains a list of users that should be allowed or denied FTP
access. Each line contains a user, optionally followed by
.Dq allow
.Dq allow
(anything but
.Dq allow
is ignored). The semi-user

View File

@@ -76,7 +76,7 @@ to host
you might do the following.
.Bl -enum
.It
On foo:
On foo:
.Nm
.Va bar
.It

View File

@@ -72,7 +72,7 @@ to host
you might do the following.
.Bl -enum
.It
On foo:
On foo:
.Nm
.Va bar
.It

View File

@@ -40,7 +40,7 @@ to host
you might do the following.
.Bl -enum
.It
On foo:
On foo:
.Nm
.Va bar
.It

View File

@@ -42,7 +42,7 @@ can have any of the following formats:
.Pp
If no username is specified,
.Nm
assumes that it's the same as on the local machine;
assumes that it's the same as on the local machine;
.Ar hostname
defaults to the value of the
.Ev MAILHOST
@@ -88,7 +88,7 @@ a list of comma-separated headers that should get printed.
.Fl -port Ns = Ns Ar port-spec
.Xc
use this port instead of the default
.Ql kpop
.Ql kpop
or
.Ql 1109 .
.El
@@ -117,8 +117,8 @@ and stores the mail in
$ push --from -5 havregryn
.Ed
.Pp
tries to fetch
.Sy From:
tries to fetch
.Sy From:
lines for current user at post office
.Dq havregryn
using Kerberos 5.

View File

@@ -10,17 +10,17 @@ remote shell
.Sh SYNOPSIS
.Nm
.Op Fl 45FGKdefnuxz
.Op Fl U Pa string
.Op Fl U Pa string
.Op Fl p Ar port
.Op Fl l Ar username
.Ar host [command]
.Sh DESCRIPTION
.Nm
authenticates to the
.Xr rshd 8
authenticates to the
.Xr rshd 8
daemon on the remote
.Ar host ,
and then executes the specified
and then executes the specified
.Ar command .
.Pp
.Nm
@@ -33,8 +33,8 @@ Valid options are:
.Fl 4 ,
.Fl -krb4
.Xc
The
.Fl 4
The
.Fl 4
option requests Kerberos 4 authentication. Normally all supported
authentication mechanisms will be tried, but in some cases more
explicit control is desired.
@@ -42,16 +42,16 @@ explicit control is desired.
.Fl 5 ,
.Fl -krb5
.Xc
The
The
.Fl 5
option requests Kerberos 5 authentication. This is analogous to the
option requests Kerberos 5 authentication. This is analogous to the
.Fl 4
option.
.It Xo
.Fl K ,
.Fl -broken
.Xc
The
The
.Fl K
option turns off all Kerberos authentication. The long name implies
that this is more or less totally unsecure. The security in this mode
@@ -60,9 +60,9 @@ relies on reserved ports, which is not very secure.
.Fl n ,
.Fl -no-input
.Xc
The
The
.Fl n
option directs the input from the
option directs the input from the
.Pa /dev/null
device (see the
.Sx BUGS
@@ -89,7 +89,7 @@ section for limitations).
The opposite of
.Fl x .
This is the default, but encryption can be enabled when using
Kerberos 5, by setting the
Kerberos 5, by setting the
.Li libdefaults/encrypt
option in
.Xr krb5.conf 5 .
@@ -97,22 +97,22 @@ option in
.Fl f ,
.Fl -forward
.Xc
Forward Kerberos 5 credentials to the remote host. Also controlled by
Forward Kerberos 5 credentials to the remote host. Also controlled by
.Li libdefaults/forward
in
in
.Xr krb5.conf 5 .
.It Xo
.Fl G
.Xc
The opposite of
The opposite of
.Fl f .
.It Xo
.Fl F ,
.Fl -forwardable
.Xc
Make the forwarded credentials re-forwardable. Also controlled by
Make the forwarded credentials re-forwardable. Also controlled by
.Li libdefaults/forwardable
in
in
.Xr krb5.conf 5 .
.It Xo
.Fl u ,
@@ -147,8 +147,8 @@ option or the
format allow the remote name to be specified.
.El
.\".Pp
.\"Without a
.\".Ar command
.\"Without a
.\".Ar command
.\".Nm
.\"will just exec
.\".Xr rlogin 1
@@ -200,13 +200,13 @@ was written as part of the Heimdal Kerberos 5 implementation.
.Sh BUGS
Some shells (notably
.Xr csh 1 )
will cause
.Nm
to block if run in the background, unless the standard input is directed away from the terminal. This is what the
will cause
.Nm
to block if run in the background, unless the standard input is directed away from the terminal. This is what the
.Fl n
option is for.
.Pp
The
The
.Fl x
options enables encryption for the session, but for both Kerberos 4
and 5 the actual command is sent unencrypted, so you should not send

View File

@@ -35,8 +35,8 @@ doesn't send any data.
Assume that clients connecting to this server will use some form of
Kerberos authentication. See the
.Sx EXAMPLES
section for a sample
.Xr inetd.conf 5
section for a sample
.Xr inetd.conf 5
configuration.
.It Xo
.Fl x ,
@@ -74,18 +74,18 @@ peculiar environments, such as some batch systems.
.Fl i ,
.Fl -no-inetd
.Xc
The
.Fl i
The
.Fl i
option will cause
.Nm
to create a socket, instead of assuming that its stdin came from
.Nm
to create a socket, instead of assuming that its stdin came from
.Xr inetd 8 .
This is mostly useful for debugging.
.It Xo
.Fl p Ar port ,
.Fl -port= Ns Ar port
.Xc
Port to use with
Port to use with
.Fl i .
.It Xo
.Fl a
@@ -95,7 +95,7 @@ This flag is for backwards compatibility only.
.Fl L
.Xc
This flag enables logging of connections to
.Xr syslogd 8 .
.Xr syslogd 8 .
This option is always on in this implementation.
.El
.\".Sh ENVIRONMENT
@@ -106,7 +106,7 @@ This option is always on in this implementation.
.El
.Sh EXAMPLES
The following can be used to enable Kerberised rsh in
.Xr inetd.cond 5 ,
.Xr inetd.cond 5 ,
while disabling non-Kerberised connections:
.Bd -literal
shell stream tcp nowait root /usr/libexec/rshd rshd -v

View File

@@ -36,7 +36,7 @@
.Os BSD 4.2
.Sh NAME
.Nm telnet
.Nd user interface to the
.Nd user interface to the
.Tn TELNET
protocol
.Sh SYNOPSIS
@@ -56,7 +56,7 @@ protocol
The
.Nm telnet
command
is used to communicate with another host using the
is used to communicate with another host using the
.Tn TELNET
protocol.
If
@@ -102,7 +102,7 @@ connection to the value
which can be a numeric TOS value
or, on systems that support it, a symbolic
TOS name found in the /etc/iptos file.
.It Fl X Ar atype
.It Fl X Ar atype
Disables the
.Ar atype
type of authentication.
@@ -129,7 +129,7 @@ Sets the initial value of the
.Ic debug
toggle to
.Dv TRUE
.It Fl e Ar escape char
.It Fl e Ar escape char
Sets the initial
.Nm
.Nm telnet
@@ -150,7 +150,7 @@ option requests that telnet obtain tickets for the remote host in
realm realm instead of the remote host's realm, as determined
by
.Xr krb_realmofhost 3 .
.It Fl l Ar user
.It Fl l Ar user
When connecting to the remote system, if the remote system
understands the
.Ev ENVIRON
@@ -163,7 +163,7 @@ option.
This option may also be used with the
.Ic open
command.
.It Fl n Ar tracefile
.It Fl n Ar tracefile
Opens
.Ar tracefile
for recording trace information.
@@ -208,7 +208,7 @@ either \*(Lqcharacter at a time\*(Rq
or \*(Lqold line by line\*(Rq
depending on what the remote system supports.
.Pp
When
When
.Dv LINEMODE
is enabled, character processing is done on the
local system, under the control of the remote system. When input
@@ -227,7 +227,7 @@ to turn off and on the local echo
(this would mostly be used to enter passwords
without the password being echoed).
.Pp
If the
If the
.Dv LINEMODE
option is enabled, or if the
.Ic localchars
@@ -242,7 +242,7 @@ and
characters are trapped locally, and sent as
.Tn TELNET
protocol sequences to the remote side.
If
If
.Dv LINEMODE
has ever been enabled, then the user's
.Ic susp
@@ -253,9 +253,9 @@ are also sent as
protocol sequences,
and
.Ic quit
is sent as a
is sent as a
.Dv TELNET ABORT
instead of
instead of
.Dv BREAK
There are options (see
.Ic toggle
@@ -296,7 +296,7 @@ and
commands).
.Pp
.Bl -tag -width "mode type"
.It Ic auth Ar argument ...
.It Ic auth Ar argument ...
The auth command manipulates the information sent through the
.Dv TELNET AUTHENTICATE
option. Valid arguments for the
@@ -320,7 +320,7 @@ authentication.
Close a
.Tn TELNET
session and return to command mode.
.It Ic display Ar argument ...
.It Ic display Ar argument ...
Displays all, or some, of the
.Ic set
and
@@ -417,7 +417,7 @@ Valid arguments for the
.Ic environ
command are:
.Bl -tag -width Fl
.It Ic define Ar variable value
.It Ic define Ar variable value
Define the variable
.Ar variable
to have a value of
@@ -427,15 +427,15 @@ The
.Ar value
may be enclosed in single or double quotes so
that tabs and spaces may be included.
.It Ic undefine Ar variable
.It Ic undefine Ar variable
Remove
.Ar variable
from the list of environment variables.
.It Ic export Ar variable
.It Ic export Ar variable
Mark the variable
.Ar variable
to be exported to the remote side.
.It Ic unexport Ar variable
.It Ic unexport Ar variable
Mark the variable
.Ar variable
to not be exported unless
@@ -469,7 +469,7 @@ If the remote side also supports the concept of
suspending a user's session for later reattachment,
the logout argument indicates that you
should terminate the session immediately.
.It Ic mode Ar type
.It Ic mode Ar type
.Ar Type
is one of several options, depending on the state of the
.Tn TELNET
@@ -490,40 +490,40 @@ Enable the
option, or, if the remote side does not understand the
.Dv LINEMODE
option, then attempt to enter \*(Lqold-line-by-line\*(Lq mode.
.It Ic isig Pq Ic \-isig
Attempt to enable (disable) the
.It Ic isig Pq Ic \-isig
Attempt to enable (disable) the
.Dv TRAPSIG
mode of the
mode of the
.Dv LINEMODE
option.
This requires that the
This requires that the
.Dv LINEMODE
option be enabled.
.It Ic edit Pq Ic \-edit
Attempt to enable (disable) the
.It Ic edit Pq Ic \-edit
Attempt to enable (disable) the
.Dv EDIT
mode of the
mode of the
.Dv LINEMODE
option.
This requires that the
This requires that the
.Dv LINEMODE
option be enabled.
.It Ic softtabs Pq Ic \-softtabs
Attempt to enable (disable) the
.It Ic softtabs Pq Ic \-softtabs
Attempt to enable (disable) the
.Dv SOFT_TAB
mode of the
mode of the
.Dv LINEMODE
option.
This requires that the
This requires that the
.Dv LINEMODE
option be enabled.
.It Ic litecho Pq Ic \-litecho
Attempt to enable (disable) the
.It Ic litecho Pq Ic \-litecho
Attempt to enable (disable) the
.Dv LIT_ECHO
mode of the
mode of the
.Dv LINEMODE
option.
This requires that the
This requires that the
.Dv LINEMODE
option be enabled.
.It Ic ?\&
@@ -579,7 +579,7 @@ Close any open
session and exit
.Nm telnet .
An end of file (in command mode) will also close a session and exit.
.It Ic send Ar arguments
.It Ic send Ar arguments
Sends one or more special character sequences to the remote host.
The following are the arguments which may be specified
(more than one argument may be specified at a time):
@@ -701,8 +701,8 @@ Prints out help information for the
.Ic send
command.
.El
.It Ic set Ar argument value
.It Ic unset Ar argument value
.It Ic set Ar argument value
.It Ic unset Ar argument value
The
.Ic set
command will set any one of a number of
@@ -1002,16 +1002,16 @@ Displays the legal
.Pq Ic unset
commands.
.El
.It Ic slc Ar state
.It Ic slc Ar state
The
.Ic slc
command (Set Local Characters) is used to set
or change the state of the the special
characters when the
characters when the
.Dv TELNET LINEMODE
option has
been enabled. Special characters are characters that get
mapped to
mapped to
.Tn TELNET
commands sequences (like
.Ic ip
@@ -1037,7 +1037,7 @@ was started.
.It Ic import
Switch to the remote defaults for the special characters.
The remote default characters are those of the remote system
at the time when the
at the time when the
.Tn TELNET
connection was established.
.It Ic ?\&
@@ -1050,7 +1050,7 @@ Show the current status of
.Nm telnet .
This includes the peer one is connected to, as well
as the current mode.
.It Ic toggle Ar arguments ...
.It Ic toggle Ar arguments ...
Toggle (between
.Dv TRUE
and
@@ -1319,13 +1319,13 @@ Suspend
.Nm telnet .
This command only works when the user is using the
.Xr csh 1 .
.It Ic \&! Op Ar command
.It Ic \&! Op Ar command
Execute a single command in a subshell on the local
system. If
.Ic command
is omitted, then an interactive
subshell is invoked.
.It Ic ?\& Op Ar command
.It Ic ?\& Op Ar command
Get help. With no arguments,
.Nm telnet
prints a help summary.
@@ -1361,7 +1361,7 @@ command appeared in
On some remote systems, echo has to be turned off manually when in
\*(Lqold line by line\*(Rq mode.
.Pp
In \*(Lqold line by line\*(Rq mode or
In \*(Lqold line by line\*(Rq mode or
.Dv LINEMODE
the terminal's
.Ic eof

View File

@@ -75,7 +75,7 @@ option may be used to start up
.Nm telnetd
manually, instead of through
.Xr inetd 8 .
If started up this way,
If started up this way,
.Ar port
may be specified to run
.Nm telnetd
@@ -153,7 +153,7 @@ to print out debugging information
to the connection, allowing the user to see what
.Nm telnetd
is doing.
There are several possible values for
There are several possible values for
.Ar debugmode :
.Bl -tag -width exercise
.It Cm options
@@ -161,7 +161,7 @@ Prints information about the negotiation of
.Tn TELNET
options.
.It Cm report
Prints the
Prints the
.Cm options
information, plus some additional information
about what processing is going on.
@@ -261,7 +261,7 @@ not warn when a user is trying to login with a cleartext password.
operates by allocating a pseudo-terminal device (see
.Xr pty 4 )
for a client, then creating a login process which has
the slave side of the pseudo-terminal as
the slave side of the pseudo-terminal as
.Dv stdin ,
.Dv stdout
and
@@ -275,7 +275,7 @@ between the remote client and the login process.
.Pp
When a
.Tn TELNET
session is started up,
session is started up,
.Nm telnetd
sends
.Tn TELNET