From e725def62c73b4aa269fefc4c0d96abb41927fcb Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Mon, 17 Nov 2014 13:17:20 -0500 Subject: exportfs: Do not fail on empty exports file. Commit 076dd80 introduced a regression that causes exportfs to fail when there is an empty /etc/exports file. A empty /etc/exports file is valid and should not cause exportfs to fail. Signed-off-by: Steve Dickson Signed-off-by: Steve Dickson --- utils/exportfs/exportfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'utils/exportfs/exportfs.c') diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index bdea12b..92fb9eb 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -47,7 +47,7 @@ static void error(nfs_export *exp, int err); static void usage(const char *progname, int n); static void validate_export(nfs_export *exp); static int matchhostname(const char *hostname1, const char *hostname2); -static void export_d_read(const char *dname); +static void export_d_read(const char *dname, int verbose); static void grab_lockfile(void); static void release_lockfile(void); @@ -182,8 +182,8 @@ main(int argc, char **argv) atexit(release_lockfile); if (f_export && ! f_ignore) { - export_read(_PATH_EXPORTS); - export_d_read(_PATH_EXPORTS_D); + export_read(_PATH_EXPORTS, f_verbose); + export_d_read(_PATH_EXPORTS_D, f_verbose); } if (f_export) { if (f_all) @@ -686,7 +686,7 @@ out: /* Based on mnt_table_parse_dir() in util-linux-ng/shlibs/mount/src/tab_parse.c */ static void -export_d_read(const char *dname) +export_d_read(const char *dname, int verbose) { int n = 0, i; struct dirent **namelist = NULL; @@ -729,7 +729,7 @@ export_d_read(const char *dname) continue; } - export_read(fname); + export_read(fname, verbose); } for (i = 0; i < n; i++) -- cgit