nfs_export *exp;
setexportent(fname, "r");
- while ((eep = getexportent()) != NULL) {
- exp = export_lookup(eep->e_hostname, eep->e_path);
+ while ((eep = getexportent(0,1)) != NULL) {
+ exp = export_lookup(eep->e_hostname, eep->e_path, 0);
if (!exp)
- export_create(eep);
+ export_create(eep,0);
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);
* Create an in-core export struct from an export entry.
*/
nfs_export *
-export_create(struct exportent *xep)
+export_create(struct exportent *xep, int canonical)
{
nfs_client *clp;
nfs_export *exp;
- if (!(clp = client_lookup(xep->e_hostname))) {
+ if (!(clp = client_lookup(xep->e_hostname, canonical))) {
/* bad export entry; complaint already logged */
return NULL;
}
}
nfs_export *
-export_lookup(char *hname, char *path)
+export_lookup(char *hname, char *path, int canonical)
{
nfs_client *clp;
nfs_export *exp;
- if (!(clp = client_lookup(hname)))
+ if (!(clp = client_lookup(hname, canonical)))
return NULL;
for (exp = exportlist[clp->m_type]; exp; exp = exp->m_next)
if (exp->m_client == clp && !strcmp(exp->m_export.e_path, path))