summaryrefslogtreecommitdiff
path: root/libexec/ftpd
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2014-03-17 22:13:47 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2014-03-17 22:13:47 +0000
commit6949d420b4fb0c247657d211f3e2c91a43d84385 (patch)
tree8d45038e07c0ba44f10172668c2f8628bcff26de /libexec/ftpd
parentf4dc22e0b89e7be895718e088fe9bacec26a3139 (diff)
tweak previous;
Diffstat (limited to 'libexec/ftpd')
-rw-r--r--libexec/ftpd/ftpd.818
1 files changed, 9 insertions, 9 deletions
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 08eede391e7..15c5f7dabd1 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ftpd.8,v 1.71 2014/03/17 20:54:10 sthen Exp $
+.\" $OpenBSD: ftpd.8,v 1.72 2014/03/17 22:13:46 jmc Exp $
.\" $NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1988, 1991, 1993
@@ -99,12 +99,6 @@ FTP session is logged using syslog with a facility of
If this option is specified twice, the retrieve (get), store (put), append,
delete, make directory, remove directory and rename operations and
their filename arguments are also logged.
-.It Fl m Ar minuid
-Disallow login to user accounts with a uid below
-.Ar minuid .
-The default is 1000, to prevent access to administrative and daemon accounts.
-Anonymous access is allowed even if the uid of the ftp user is smaller than
-.Ar minuid .
.It Fl M
Enables multihomed mode.
Instead of simply using
@@ -113,6 +107,12 @@ for anonymous transfers, a directory matching the fully qualified name of
the IP number the client connected to, and located inside
.Pa ~ftp ,
is used instead.
+.It Fl m Ar minuid
+Disallow login to user accounts with a UID below
+.Ar minuid .
+The default is 1000, to prevent access to administrative and daemon accounts.
+Anonymous access is allowed even if the UID of the FTP user is smaller than
+.Ar minuid .
.It Fl n
Do not permit anonymous FTP logins.
Normally they are permitted.
@@ -302,7 +302,7 @@ entry in
.Pa /etc/login.conf .
.Pp
.Nm
-authenticates users according to six rules.
+authenticates users according to the following rules.
.Bl -enum -offset indent
.It
The login name must be in the password database and not have a null password.
@@ -312,7 +312,7 @@ file operations may be performed.
The login name must not appear in the file
.Pa /etc/ftpusers .
.It
-The user account must have a uid not less than
+The user account must have a UID not less than
.Ar minuid .
.It
The user must have a standard shell as described by