/*
- * support/export/rmntab.c
+ * support/export/rmtab.c
*
- * Interface to the rmnt file.
+ * Interface to the rmtab file.
*
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include "xmalloc.h"
+
#include "misc.h"
#include "nfslib.h"
#include "exportfs.h"
#include "xio.h"
#include "xlog.h"
+/*
+ * See if the entry already exists. If not,
+ * this was an instantiated wild card, and we
+ * must add it.
+ */
+static void
+rmtab_read_wildcard(struct rmtabent *rep)
+{
+ nfs_export *exp, *exp2;
+ struct addrinfo *ai;
+
+ ai = host_addrinfo(rep->r_client);
+ if (ai == NULL)
+ return;
+
+ exp = export_allowed(ai, rep->r_path);
+ freeaddrinfo(ai);
+ if (exp == NULL)
+ return;
+
+ exp2 = export_lookup(rep->r_client, exp->m_export.e_path, 0);
+ if (exp2 == NULL) {
+ struct exportent ee;
+
+ memset(&ee, 0, sizeof(ee));
+ dupexportent(&ee, &exp->m_export);
+
+ ee.e_hostname = rep->r_client;
+ exp2 = export_create(&ee, 0);
+ exp2->m_changed = exp->m_changed;
+ }
+ exp2->m_mayexport = 1;
+}
+
int
rmtab_read(void)
{
struct rmtabent *rep;
- nfs_export *exp;
setrmtabent("r");
while ((rep = getrmtabent(1, NULL)) != NULL) {
- struct exportent *xp;
- struct hostent *hp = NULL;
int htype;
-
- htype = client_gettype(rep->r_client);
- if (htype == MCL_FQDN
- && (hp = gethostbyname (rep->r_client))
- && (hp = hostent_dup (hp),
- xp = export_allowed (hp, rep->r_path))) {
- /* see if the entry already exists, otherwise this was an instantiated
- * wild card, and we must add it
- */
- exp = export_lookup(rep->r_client, xp->e_path);
- if (!exp) {
- strncpy (xp->e_hostname, rep->r_client,
- sizeof (xp->e_hostname) - 1);
- xp->e_hostname[sizeof (xp->e_hostname) -1] = '\0';
- exp = export_create(xp);
- }
- free (hp);
- if (!exp)
- continue;
- exp->m_mayexport = 1;
- } else if (hp) /* export_allowed failed */
- free(hp);
+ htype = client_gettype(rep->r_client);
+ if (htype == MCL_FQDN || htype == MCL_SUBNETWORK)
+ rmtab_read_wildcard(rep);
}
+
if (errno == EINVAL) {
/* Something goes wrong. We need to fix the rmtab
file. */
int lockid;
FILE *fp;
- if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
+ if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
return -1;
rewindrmtabent();
if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) {