From: hjl <hjl>
Date: Mon, 7 May 2001 00:54:18 +0000 (+0000)
Subject: 2001-05-06  Anne Milicia <milicia@missioncriticallinux.com>
X-Git-Tag: nfs-utils-0-3-2-pre6~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=86ae664e66c439354cb4f959e9f289059e7760a4;p=nfs-utils.git

2001-05-06  Anne Milicia <milicia@missioncriticallinux.com>

	* support/export/client.c (client_check): Check IP address
	againet netgroup.

2001-05-06  Neil Brown <neilb@cse.unsw.edu.au>

	* support/export/client.c (client_gettype): Treat `*' as
	MCL_ANONYMOUS.
---

diff --git a/ChangeLog b/ChangeLog
index 72d52f3..1760d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-06  Anne Milicia <milicia@missioncriticallinux.com>
+
+	* support/export/client.c (client_check): Check IP address
+	againet netgroup.
+
+2001-05-06  Neil Brown <neilb@cse.unsw.edu.au>
+
+	* support/export/client.c (client_gettype): Treat `*' as
+	MCL_ANONYMOUS.
+
 2001-04-22  H.J. Lu <hjl@lucon.org>
 
 	* nfs-utils.spec.in: Fix a typo.
diff --git a/support/export/client.c b/support/export/client.c
index 3afd4f2..1fd4269 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -239,12 +239,23 @@ client_check(nfs_client *clp, struct hostent *hp)
 		{
 			char	*dot;
 			int	match;
+			struct hostent *nhp = NULL;
+			struct sockaddr_in addr;
 
 			/* First, try to match the hostname without
 			 * splitting off the domain */
 			if (innetgr(cname+1, hname, NULL, NULL))
 				return 1;
 
+			/* If hname is ip address convert to FQDN */
+			if (inet_aton(hname, &addr.sin_addr) &&
+			   (nhp = gethostbyaddr((const char *)&(addr.sin_addr),
+			    sizeof(addr.sin_addr), AF_INET))) {
+				hname = (char *)nhp->h_name;
+				if (innetgr(cname+1, hname, NULL, NULL))
+					return 1;
+			}
+
 			/* Okay, strip off the domain (if we have one) */
 			if ((dot = strchr(hname, '.')) == NULL)
 				return 0;
@@ -291,7 +302,7 @@ client_gettype(char *ident)
 {
 	char	*sp;
 
-	if (ident[0] == '\0')
+	if (ident[0] == '\0' || strcmp(ident, "*")==0)
 		return MCL_ANONYMOUS;
 	if (ident[0] == '@') {
 #ifndef HAVE_INNETGR