summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mountd
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-10-02 17:58:47 +0000
committerbdrewery <bdrewery@FreeBSD.org>2014-10-02 17:58:47 +0000
commitf19c28648acf3bcdd5e4454a0d7fb42ceb6f1860 (patch)
tree00324e91db51270f344b52944b65516bae3f5b3e /usr.sbin/mountd
parent0bbb133a516a472ce6215fb37ab2487ff207356e (diff)
downloadFreeBSD-src-f19c28648acf3bcdd5e4454a0d7fb42ceb6f1860.zip
FreeBSD-src-f19c28648acf3bcdd5e4454a0d7fb42ceb6f1860.tar.gz
MFC r270183:
Avoid showing stale errors when nmount(2) fails. This should not be documented in relnotes as it still fails due to a race with unmounting, but no longer shows bogus details. Approved by: re (gjb)
Diffstat (limited to 'usr.sbin/mountd')
-rw-r--r--usr.sbin/mountd/mountd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 1913410..6e4085c 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -1744,6 +1744,7 @@ get_exportlist(void)
iov[3].iov_len = strlen(fsp->f_mntonname) + 1;
iov[5].iov_base = fsp->f_mntfromname;
iov[5].iov_len = strlen(fsp->f_mntfromname) + 1;
+ errmsg[0] = '\0';
if (nmount(iov, iovlen, fsp->f_flags) < 0 &&
errno != ENOENT && errno != ENOTSUP) {
@@ -2501,6 +2502,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, int exflags,
iov[3].iov_len = strlen(fsb->f_mntonname) + 1;
iov[5].iov_base = fsb->f_mntfromname; /* "from" */
iov[5].iov_len = strlen(fsb->f_mntfromname) + 1;
+ errmsg[0] = '\0';
while (nmount(iov, iovlen, fsb->f_flags) < 0) {
if (cp)
OpenPOWER on IntegriCloud