X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Frmtab.c;h=4e141c3516a34efc6c0a47adc16810939b0cf3ae;hp=44a0edce728bbed6e87fa25911bfafac682e1476;hb=282284fac3c3fe20187f892e3ce15ac319c8acb7;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 44a0edc..4e141c3 100644
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -24,29 +24,33 @@ rmtab_read(void)
 	nfs_export		*exp;
 
 	setrmtabent("r");
-	while ((rep = getrmtabent(1)) != NULL) {
-		exp = export_lookup(rep->r_client, rep->r_path);
-		if (!exp) {
-			struct exportent	*xp;
-			struct hostent		*hp;
-			int			htype;
-
-			htype = client_gettype(rep->r_client);
-			if (htype == MCL_FQDN
-			    && (hp = gethostbyname (rep->r_client), hp)
-			    && (hp = hostent_dup (hp),
-				   xp = export_allowed (hp, rep->r_path))) {
+	while ((rep = getrmtabent(1, NULL)) != NULL) {
+		struct exportent	*xp;
+		struct hostent		*hp = NULL;
+		int			htype;
+		
+		htype = client_gettype(rep->r_client);
+		if (htype == MCL_FQDN
+		    && (hp = gethostbyname (rep->r_client))
+		    && (hp = hostent_dup (hp),
+			xp = export_allowed (hp, rep->r_path))) {
+			/* see if the entry already exists, otherwise this was an instantiated
+			 * wild card, and we must add it
+			 */
+			exp = export_lookup(rep->r_client, xp->e_path);
+			if (!exp) {
 				strncpy (xp->e_hostname, rep->r_client,
 					 sizeof (xp->e_hostname) - 1);
 				xp->e_hostname[sizeof (xp->e_hostname) -1] = '\0';
 				exp = export_create(xp);
-				free (hp);
 			}
+			free (hp);
 
 			if (!exp)
 				continue;
 			exp->m_mayexport = 1;
-		}
+		} else if (hp) /* export_allowed failed */
+			free(hp);
 	}
 	if (errno == EINVAL) {
 		/* Something goes wrong. We need to fix the rmtab
@@ -61,8 +65,8 @@ rmtab_read(void)
 			xfunlock(lockid);
 			return -1;
 		}
-		while ((rep = getrmtabent(0)) != NULL) {
-			fputrmtabent(fp, rep);
+		while ((rep = getrmtabent(0, NULL)) != NULL) {
+			fputrmtabent(fp, rep, NULL);
 		}
 		if (rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) {
 			xlog(L_ERROR, "couldn't rename %s to %s",