X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Fclient.c;h=3afd4f2940c0455af93975d55b39590a09389b0f;hp=8c5200af10ef36aba828ca74d89f9d7a8ba88dd7;hb=a19d80373216f3257c1b5ef59e41279f94744377;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9

diff --git a/support/export/client.c b/support/export/client.c
index 8c5200a..3afd4f2 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -118,7 +118,20 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 
 		*cp = '\0';
 		clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
-		clp->m_addrlist[1].s_addr = inet_addr(cp+1);
+		if (strchr(cp + 1, '.')) {
+			clp->m_addrlist[1].s_addr = inet_addr(cp+1);
+		}
+		else {
+			int netmask = atoi(cp + 1);
+			if (0 < netmask && netmask <= 32) {
+				clp->m_addrlist[1].s_addr =
+					htonl ((uint32_t) ~0 << (32 - netmask));
+			}
+			else {
+				xlog(L_FATAL, "invalid netmask `%s' for %s",
+				     cp + 1, clp->m_hostname);
+			}
+		}
 		*cp = '/';
 		clp->m_naddr = 0;
 	} else if (!hp) {
@@ -237,7 +250,7 @@ client_check(nfs_client *clp, struct hostent *hp)
 				return 0;
 
 			*dot = '\0';
-			match = innetgr(cname+1, hname, NULL, dot + 1);
+			match = innetgr(cname+1, hname, NULL, NULL);
 			*dot = '.';
 
 			return match;