kern.usermount is currently a no-op;

ok deraadt

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 862f8a5..d2e3c98 100644 (file)
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: sysctl.3,v 1.265 2016/06/30 15:58:06 tedu Exp $
+.\"    $OpenBSD: sysctl.3,v 1.266 2016/07/14 17:34:06 jmc Exp $
 .\"
 .\" Copyright (c) 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 30 2016 $
+.Dd $Mdocdate: July 14 2016 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -1017,10 +1017,7 @@ Number of available
 .Xr tty 4
 devices.
 .It Dv KERN_USERMOUNT
-Return non-zero if regular users can issue
-.Xr mount 2
-requests.
-The default value is 0.
+Currently a no-op.
 .It Dv KERN_VERSION
 The system version string.
 .It Dv KERN_WATCHDOG

diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index a543a64..892dc21 100644 (file)
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: mount.8,v 1.80 2016/06/19 18:43:40 jmc Exp $
+.\"    $OpenBSD: mount.8,v 1.81 2016/07/14 17:34:06 jmc Exp $
 .\"    $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mount.8    8.7 (Berkeley) 3/27/94
 .\"
-.Dd $Mdocdate: June 19 2016 $
+.Dd $Mdocdate: July 14 2016 $
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -89,20 +89,7 @@ except in the special case of
 .Pa / ,
 of course
 .Pc .
-Only the superuser may mount file systems unless
-.Va kern.usermount
-is nonzero
-.Po
-see
-.Xr sysctl 8
-.Pc ,
-the
-.Ar special
-device
-is readable and writeable by the user attempting the mount,
-and the mount point
-.Ar node
-is owned by the user attempting the mount.
+Only the superuser may mount file systems.
 .Pp
 The system maintains a list of currently mounted file systems.
 If no arguments are given to