Attachment 579035 Details for Bug 797209 – try resolving client as either ip address or list of "domains"

[patch] try resolving client as either ip address or list of "domains"

TMP (text/plain), 1.76 KB, created by J. Bruce Fields on 2012-04-20 15:06:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J. Bruce Fields

Created: 2012-04-20 15:06:40 UTC

Size: 1.76 KB

patch

obsolete

>diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
>index ac9cdbd..181922b 100644
>--- a/utils/mountd/cache.c
>+++ b/utils/mountd/cache.c
>@@ -495,6 +495,28 @@ static bool match_fsid(struct parsed_fsid *parsed, nfs_export *exp, char *path)
> 	return false;
> }
> 
>+static bool match_client(char *dom, nfs_export *exp, struct addrinfo *ai)
>+{
>+	if (client_member(dom, exp->m_client->m_hostname))
>+		return true;
>+	if (ai && client_check(exp->m_client, ai))
>+		return true;
>+	return false;
>+}
>+
>+struct addrinfo *lookup_client_addr(char *dom)
>+{
>+	struct addrinfo *ret;
>+	struct addrinfo *tmp;
>+
>+	tmp = host_pton(dom);
>+	if (tmp == NULL)
>+		return NULL;
>+	ret = client_resolve(tmp->ai_addr);
>+	freeaddrinfo(tmp);
>+	return ret;
>+}
>+
> static void nfsd_fh(FILE *f)
> {
> 	/* request are:
>@@ -538,6 +560,8 @@ static void nfsd_fh(FILE *f)
> 
> 	auth_reload();
> 
>+	ai = lookup_client_addr(dom);
>+
> 	/* Now determine export point for this fsid/domain */
> 	for (i=0 ; i < MCL_MAXTYPES; i++) {
> 		nfs_export *next_exp;
>@@ -568,7 +592,7 @@ static void nfsd_fh(FILE *f)
> 				next_exp = exp->m_next;
> 			}
> 
>-			if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname))
>+			if (!match_client(dom, exp, ai))
> 				continue;
> 			if (exp->m_export.e_mountpoint &&
> 			    !is_mountpoint(exp->m_export.e_mountpoint[0]?
>@@ -578,18 +602,6 @@ static void nfsd_fh(FILE *f)
> 
> 			if (!match_fsid(&parsed, exp, path))
> 				continue;
>-			if (use_ipaddr) {
>-				if (ai == NULL) {
>-					struct addrinfo *tmp;
>-					tmp = host_pton(dom);
>-					if (tmp == NULL)
>-						goto out;
>-					ai = client_resolve(tmp->ai_addr);
>-					freeaddrinfo(tmp);
>-				}
>-				if (!client_check(exp->m_client, ai))
>-					continue;
>-			}
> 			if (!found || subexport(&exp->m_export, found)) {
> 				found = &exp->m_export;
> 				free(found_path);

Actions: View | Diff

Attachments on bug 797209: 579035 | 581507