Skip to contentSkip to conversation

fix mountd netgroup lookup for short hostnames

PATCH Frank Sorenson 2 participants 2 messages Dec 14, 2015 – Dec 16, 2015 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Commit 9a92ef6f194926904b1289e0ce1daecb42bd5e8b to add netgroup lookup of resolvable IP addresses inadvertently broke the netgroup check for short hostnames by clobbering the 'hname' variable.

This patch fixes that breakage by changing the IP address lookup to use a separate variable. The 'hname' variable used in the short hostname lookup is now untouched in the IP lookup code.

Author: Frank Sorenson <[email protected]>
Date:   Mon Dec 14 15:50:30 2015 -0600

mountd: fix netgroup lookup for short hostnames

Commit 9a92ef6f194926904b1289e0ce1daecb42bd5e8b to add netgroup lookup of resolvable IP addresses inadvertently broke the netgroup check for short hostnames.

This patch fixes that breakage by changing the IP address lookup to use a separate variable.

support/export/client.c +7 -10
index af9e6bb..2346f99 100644
@@ -639,7 +639,7 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 	const char *netgroup = clp->m_hostname + 1;
 	struct addrinfo *tmp = NULL;
 	struct hostent *hp;
-	char *dot, *hname;
+	char *dot, *hname, *ip;
 	int i, match;
 
 	match = 0;
@@ -687,19 +687,16 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 	}
 
 	/* check whether the IP itself is in the netgroup */
-	for (tmp = (struct addrinfo *)ai ; tmp != NULL ; tmp = tmp->ai_next) {
-		free(hname);
-		hname = calloc(INET6_ADDRSTRLEN, 1);
-
-		if (inet_ntop(tmp->ai_family, &(((struct sockaddr_in *)tmp->ai_addr)->sin_addr), hname, INET6_ADDRSTRLEN) != hname) {
-			xlog(D_GENERAL, "  %s: unable to inet_ntop addrinfo %p: %m", __func__, tmp, errno);
-			goto out;
-		}
-		if (innetgr(netgroup, hname, NULL, NULL)) {
+	ip = calloc(INET6_ADDRSTRLEN, 1);
+	if (inet_ntop(ai->ai_family, &(((struct sockaddr_in *)ai->ai_addr)->sin_addr), ip, INET6_ADDRSTRLEN) == ip) {
+		if (innetgr(netgroup, ip, NULL, NULL)) {
+			free(hname);
+			hname = ip;
 			match = 1;
 			goto out;
 		}
 	}
+	free(ip);
 
 	/* Okay, strip off the domain (if we have one) */
 	dot = strchr(hname, '.');
#2 lore raw
Quoted 18 lines · Frank Sorenson

Commit 9a92ef6f194926904b1289e0ce1daecb42bd5e8b to add netgroup lookup of resolvable IP addresses inadvertently broke the netgroup check for short hostnames by clobbering the 'hname' variable.

This patch fixes that breakage by changing the IP address lookup to use a separate variable. The 'hname' variable used in the short hostname lookup is now untouched in the IP lookup code.

Author: Frank Sorenson <[email protected]>
Date:   Mon Dec 14 15:50:30 2015 -0600

mountd: fix netgroup lookup for short hostnames

Quoted 8 lines

Commit 9a92ef6f194926904b1289e0ce1daecb42bd5e8b to add netgroup lookup of resolvable IP addresses inadvertently broke the netgroup check for short hostnames.

This patch fixes that breakage by changing the IP address lookup to use a separate variable.

Committed... Thanks!

steved.

Quoted 41 lines
support/export/client.c +7 -10
index af9e6bb..2346f99 100644
@@ -639,7 +639,7 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 	const char *netgroup = clp->m_hostname + 1;
 	struct addrinfo *tmp = NULL;
 	struct hostent *hp;
-	char *dot, *hname;
+	char *dot, *hname, *ip;
 	int i, match;
 
 	match = 0;
@@ -687,19 +687,16 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 	}
 
 	/* check whether the IP itself is in the netgroup */
-	for (tmp = (struct addrinfo *)ai ; tmp != NULL ; tmp = tmp->ai_next) {
-		free(hname);
-		hname = calloc(INET6_ADDRSTRLEN, 1);
-
-		if (inet_ntop(tmp->ai_family, &(((struct sockaddr_in *)tmp->ai_addr)->sin_addr), hname, INET6_ADDRSTRLEN) != hname) {
-			xlog(D_GENERAL, "  %s: unable to inet_ntop addrinfo %p: %m", __func__, tmp, errno);
-			goto out;
-		}
-		if (innetgr(netgroup, hname, NULL, NULL)) {
+	ip = calloc(INET6_ADDRSTRLEN, 1);
+	if (inet_ntop(ai->ai_family, &(((struct sockaddr_in *)ai->ai_addr)->sin_addr), ip, INET6_ADDRSTRLEN) == ip) {
+		if (innetgr(netgroup, ip, NULL, NULL)) {
+			free(hname);
+			hname = ip;
 			match = 1;
 			goto out;
 		}
 	}
+	free(ip);
 
 	/* Okay, strip off the domain (if we have one) */
 	dot = strchr(hname, '.');