Make ftpd man page and ftp spool entries in mtree special file

consistent.  Noted by William Wisner <wisner@gryphon.com>

diff --git a/etc/mtree/special b/etc/mtree/special
index da259c6..3cb3b66 100644 (file)
--- a/etc/mtree/special
+++ b/etc/mtree/special
@@ -1,4 +1,4 @@
-#      $OpenBSD: special,v 1.11 1997/03/30 17:52:19 millert Exp $
+#      $OpenBSD: special,v 1.12 1997/04/14 00:55:04 millert Exp $
 #      $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #      @(#)special     8.2 (Berkeley) 1/23/94
 #
@@ -135,15 +135,15 @@ run               type=dir mode=0755 uname=root gname=wheel
 utmp           type=file mode=0664 uname=root gname=utmp
 ..     #var/run
 spool          type=dir mode=0755 uname=root gname=wheel
-ftp            type=dir mode=0755 uname=root gname=wheel optional
-bin            type=dir mode=0755 uname=root gname=wheel optional
-ls             type=file mode=0555 uname=root gname=wheel optional
+ftp            type=dir mode=0555 uname=root gname=wheel optional
+bin            type=dir mode=0511 uname=root gname=wheel optional
+ls             type=file mode=0111 uname=root gname=wheel optional
 ..     #var/spool/ftp/bin
-etc            type=dir mode=0755 uname=root gname=wheel optional
-group          type=file mode=0644 uname=root gname=wheel optional
-localtime      type=file mode=0644 uname=root gname=wheel optional
-master.passwd  type=file mode=0600 uname=root gname=wheel optional
-passwd         type=file mode=0644 uname=root gname=wheel optional
+etc            type=dir mode=0511 uname=root gname=wheel optional
+group          type=file mode=0444 uname=root gname=wheel optional
+localtime      type=file mode=0444 uname=root gname=wheel optional
+master.passwd  type=file mode=0400 uname=root gname=wheel optional
+passwd         type=file mode=0444 uname=root gname=wheel optional
 ..     #var/spool/ftp/etc
 hidden         type=dir mode=0111 uname=root gname=wheel optional ignore
 ..     #var/spool/ftp/hidden

diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index f52df8a..9f40a6b 100644 (file)
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ftpd.8,v 1.10 1997/03/29 20:02:00 millert Exp $
+.\"    $OpenBSD: ftpd.8,v 1.11 1997/04/14 00:55:03 millert Exp $
 .\"    $NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -299,7 +299,7 @@ and unwritable by anyone (mode 555).
 .It Pa ~ftp/bin
 Make this directory owned by
 .Dq root
-and unwritable by anyone (mode 555 or 111).
+and unwritable by anyone (mode 511).
 The program
 .Xr ls 1
 must be present to support the list command.
@@ -307,7 +307,7 @@ This program should be mode 111 (executable only).
 .It Pa ~ftp/etc
 Make this directory owned by
 .Dq root
-and unwritable by anyone (mode 555 or 111).
+and unwritable by anyone (mode 511).
 The files pwd.db (see
 .Xr pwd_mkdb 8 )
 and