diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-05-03 15:01:20 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2012-05-03 15:12:09 -0400 |
| commit | 236025253c6ec534cd816390464435ec18c499f7 (patch) | |
| tree | 78980950e3def72eef76c9f2313288397e8a7e18 /utils/mountd/auth.c | |
| parent | 005c49a063544b4005b5b7c3c28ed48c197f66ac (diff) | |
| download | nfs-utils-236025253c6ec534cd816390464435ec18c499f7.tar.gz nfs-utils-236025253c6ec534cd816390464435ec18c499f7.tar.xz nfs-utils-236025253c6ec534cd816390464435ec18c499f7.zip | |
mountd: add trivial helpers for client-matching
From: "J. Bruce Fields" <bfields@redhat.com>
Pull out a tiny bit of common logic from three functions.
Possibly minor overkill, but simplifies the next patch.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/mountd/auth.c')
| -rw-r--r-- | utils/mountd/auth.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c index 3843756..688bf78 100644 --- a/utils/mountd/auth.c +++ b/utils/mountd/auth.c @@ -131,6 +131,23 @@ get_client_hostname(const struct sockaddr *caller, struct addrinfo *ai, return strdup("DEFAULT"); } +bool ipaddr_client_matches(nfs_export *exp, struct addrinfo *ai) +{ + return client_check(exp->m_client, ai); +} + +bool namelist_client_matches(nfs_export *exp, char *dom) +{ + return client_member(dom, exp->m_client->m_hostname); +} + +bool client_matches(nfs_export *exp, char *dom, struct addrinfo *ai) +{ + if (use_ipaddr) + return ipaddr_client_matches(exp, ai); + return namelist_client_matches(exp, dom); +} + /* return static nfs_export with details filled in */ static nfs_export * auth_authenticate_newcache(const struct sockaddr *caller, @@ -155,9 +172,7 @@ auth_authenticate_newcache(const struct sockaddr *caller, for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { if (strcmp(path, exp->m_export.e_path)) continue; - if (!use_ipaddr && !client_member(my_client.m_hostname, exp->m_client->m_hostname)) - continue; - if (use_ipaddr && !client_check(exp->m_client, ai)) + if (!client_matches(exp, my_client.m_hostname, ai)) continue; if (exp->m_export.e_flags & NFSEXP_V4ROOT) /* not acceptable for v[23] export */ |