summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2011-04-12 14:51:40 +0000
committerjsing <jsing@openbsd.org>2011-04-12 14:51:40 +0000
commitd5cc11fdeb28c9ebfe66da83696653f056046300 (patch)
tree83806676db8e198c94fb50c422ac9f61a3d0bc85
parentSplicing is currently only supported for TCP relays, not for HTTP or (diff)
downloadwireguard-openbsd-d5cc11fdeb28c9ebfe66da83696653f056046300.tar.xz
wireguard-openbsd-d5cc11fdeb28c9ebfe66da83696653f056046300.zip
Make mount work when the special is provided as a DUID.
Diff from Alexander Polakov. ok phessler@
-rw-r--r--sbin/mount/mount.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 8f156df3998..bbf302157df 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.c,v 1.51 2011/04/06 11:36:26 miod Exp $ */
+/* $OpenBSD: mount.c,v 1.52 2011/04/12 14:51:40 jsing Exp $ */
/* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */
/*
@@ -232,7 +232,9 @@ main(int argc, char * const argv[])
mntonname = mntbuf->f_mntonname;
} else {
if ((fs = getfsfile(mntpath)) == NULL &&
- (fs = getfsspec(mntpath)) == NULL)
+ (fs = getfsspec(mntpath)) == NULL &&
+ (isduid(*argv, 0) == 0 ||
+ (fs = getfsspec(*argv)) == NULL))
errx(1, "can't find fstab entry for %s.",
*argv);
if (BADTYPE(fs->fs_type))