diff options
Diffstat (limited to 'support/export')
| -rw-r--r-- | support/export/export.c | 4 | ||||
| -rw-r--r-- | support/export/rmtab.c | 30 |
2 files changed, 19 insertions, 15 deletions
diff --git a/support/export/export.c b/support/export/export.c index 09efaa8..ef12056 100644 --- a/support/export/export.c +++ b/support/export/export.c @@ -38,14 +38,14 @@ export_read(char *fname) export_create(eep); else { if (exp->m_export.e_flags != eep->e_flags) { - xlog(L_ERROR, "incompatible dupilcated export entries:"); + xlog(L_ERROR, "incompatible duplicated export entries:"); xlog(L_ERROR, "\t%s:%s (0x%x) [IGNORED]", eep->e_hostname, eep->e_path, eep->e_flags); xlog(L_ERROR, "\t%s:%s (0x%x)", exp->m_export.e_hostname, exp->m_export.e_path, exp->m_export.e_flags); } else { - xlog(L_ERROR, "dupilcated export entries:"); + xlog(L_ERROR, "duplicated export entries:"); xlog(L_ERROR, "\t%s:%s", eep->e_hostname, eep->e_path); xlog(L_ERROR, "\t%s:%s", exp->m_export.e_hostname, exp->m_export.e_path); diff --git a/support/export/rmtab.c b/support/export/rmtab.c index 44a0edc..4d0bc02 100644 --- a/support/export/rmtab.c +++ b/support/export/rmtab.c @@ -25,28 +25,32 @@ rmtab_read(void) setrmtabent("r"); while ((rep = getrmtabent(1)) != NULL) { - exp = export_lookup(rep->r_client, rep->r_path); - if (!exp) { - struct exportent *xp; - struct hostent *hp; - int htype; - - htype = client_gettype(rep->r_client); - if (htype == MCL_FQDN - && (hp = gethostbyname (rep->r_client), hp) - && (hp = hostent_dup (hp), - xp = export_allowed (hp, rep->r_path))) { + 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); } + free (hp); if (!exp) continue; exp->m_mayexport = 1; - } + } else if (hp) /* export_allowed failed */ + free(hp); } if (errno == EINVAL) { /* Something goes wrong. We need to fix the rmtab |