diff options
Diffstat (limited to 'utils/mountd/cache.c')
| -rw-r--r-- | utils/mountd/cache.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index c5f8093..be5198e 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -587,7 +587,7 @@ static void nfsd_fh(FILE *f) next_exp = exp->m_next; } - if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname)) + if (!use_ipaddr && !namelist_client_matches(exp, dom)) continue; if (exp->m_export.e_mountpoint && !is_mountpoint(exp->m_export.e_mountpoint[0]? @@ -597,7 +597,7 @@ static void nfsd_fh(FILE *f) if (!match_fsid(&parsed, exp, path)) continue; - if (use_ipaddr && !client_check(exp->m_client, ai)) + if (use_ipaddr && !ipaddr_client_matches(exp, ai)) continue; if (!found || subexport(&exp->m_export, found)) { found = &exp->m_export; @@ -760,14 +760,6 @@ static int path_matches(nfs_export *exp, char *path) } static int -client_matches(nfs_export *exp, char *dom, struct addrinfo *ai) -{ - if (use_ipaddr) - return client_check(exp->m_client, ai); - return client_member(dom, exp->m_client->m_hostname); -} - -static int export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai) { return path_matches(exp, path) && client_matches(exp, dom, ai); |