From patchwork Thu Feb 17 12:59:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masatake YAMATO X-Patchwork-Id: 570161 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1HCx4Ll030798 for ; Thu, 17 Feb 2011 12:59:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753482Ab1BQM7D (ORCPT ); Thu, 17 Feb 2011 07:59:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17921 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666Ab1BQM7B (ORCPT ); Thu, 17 Feb 2011 07:59:01 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1HCx1b3022005 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 17 Feb 2011 07:59:01 -0500 Received: from localhost (beach.nrt.redhat.com [10.64.200.71]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p1HCx04v019654 for ; Thu, 17 Feb 2011 07:59:01 -0500 Date: Thu, 17 Feb 2011 21:59:00 +0900 (JST) Message-Id: <20110217.215900.388120588347145930.yamato@redhat.com> To: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] Read /etc/exports.d/*.export as extra export files From: Masatake YAMATO Organization: Red Hat Japan, Inc. Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Feb 2011 12:59:04 +0000 (UTC) diff --git a/support/include/nfslib.h b/support/include/nfslib.h index 53ece0e..864aae2 100644 --- a/support/include/nfslib.h +++ b/support/include/nfslib.h @@ -25,6 +25,12 @@ #ifndef _PATH_EXPORTS #define _PATH_EXPORTS "/etc/exports" #endif +#ifndef _PATH_EXPORTS_D +#define _PATH_EXPORTS_D "/etc/exports.d" +#endif +#ifndef _EXT_EXPORT +#define _EXT_EXPORT ".export" +#endif #ifndef _PATH_IDMAPDCONF #define _PATH_IDMAPDCONF "/etc/idmapd.conf" #endif diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index b78957f..26d0504 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "sockaddr.h" #include "misc.h" @@ -41,6 +42,7 @@ static void error(nfs_export *exp, int err); static void usage(const char *progname); static void validate_export(nfs_export *exp); static int matchhostname(const char *hostname1, const char *hostname2); +static void export_d_read(const char *dname); int main(int argc, char **argv) @@ -127,8 +129,10 @@ main(int argc, char **argv) return 0; } } - if (f_export && ! f_ignore) + if (f_export && ! f_ignore) { export_read(_PATH_EXPORTS); + export_d_read(_PATH_EXPORTS_D); + } if (f_export) { if (f_all) export_all(f_verbose); @@ -485,6 +489,59 @@ out: return result; } +/* Based on mnt_table_parse_dir() in + util-linux-ng/shlibs/mount/src/tab_parse.c */ +static void +export_d_read(const char *dname) +{ + int n = 0, i; + struct dirent **namelist = NULL; + + + n = scandir(dname, &namelist, NULL, versionsort); + if (n < 0) + xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno)); + else if (n == 0) + return; + + for (i = 0; i < n; i++) { + struct dirent *d = namelist[i]; + size_t namesz; + char fname[PATH_MAX + 1]; + int fname_len; + + + if (d->d_type != DT_UNKNOWN + && d->d_type != DT_REG + && d->d_type != DT_LNK) + continue; + if (*d->d_name == '.') + continue; + +#define _EXT_EXPORT_SIZ (sizeof(_EXT_EXPORT) - 1) + namesz = strlen(d->d_name); + if (!namesz + || namesz < _EXT_EXPORT_SIZ + 1 + || strcmp(d->d_name + (namesz - _EXT_EXPORT_SIZ), + _EXT_EXPORT)) + continue; + + fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name); + if (fname_len > PATH_MAX) { + xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname); + continue; + } + + export_read(fname); + } + + for (i = 0; i < n; i++) + free(namelist[i]); + free(namelist); + + return; +} + static char dumpopt(char c, char *fmt, ...) {