From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 1 Sep 2011 15:34:25 +0000 (-0400)
Subject: exportfs: do not warn if /etc/exports.d/ does not exist
X-Git-Tag: nfs-utils-1-2-5-rc3~14
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f07eb99180aa933366d6ec4ed9422a12d23a17b8;p=nfs-utils.git

exportfs: do not warn if /etc/exports.d/ does not exist

It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
that big of a deal as often times, a simple /etc/exports is sufficient.
So silently skip the case where the dir is missing.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 986a272..7432a65 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -529,9 +529,12 @@ export_d_read(const char *dname)
 
 
 	n = scandir(dname, &namelist, NULL, versionsort);
-	if (n < 0)
+	if (n < 0) {
+		if (errno == ENOENT)
+			/* Silently return */
+			return;
 		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
-	else if (n == 0)
+	} else if (n == 0)
 		return;
 
 	for (i = 0; i < n; i++) {