summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjh <jh@FreeBSD.org>2012-01-16 19:34:21 +0000
committerjh <jh@FreeBSD.org>2012-01-16 19:34:21 +0000
commitae73284c1a1116d89c84235929df10421a348b30 (patch)
tree54d0a2f2ed01c217587bf7b24aec11a7fbcadd97 /usr.sbin
parent5a45f730a5625608124e818a7be2c3dbd2d20512 (diff)
downloadFreeBSD-src-ae73284c1a1116d89c84235929df10421a348b30.zip
FreeBSD-src-ae73284c1a1116d89c84235929df10421a348b30.tar.gz
Change checkpath() to not exit on error. This is a prerequisite for
fixing the mount(8) "failok" option. PR: 163668 Reviewed by: Garrett Cooper, delphij (previous version)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/mount_portalfs/mount_portalfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index f4f5313..3bffbb1 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -140,7 +140,8 @@ main(int argc, char *argv[])
}
/* resolve the mountpoint with realpath(3) */
- (void)checkpath(argv[optind+1], mountpt);
+ if (checkpath(argv[optind+1], mountpt) != 0)
+ err(EX_USAGE, "%s", mountpt);
/*
* Construct the listening socket
OpenPOWER on IntegriCloud