X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Frmtab.c;h=8f392a7e83ffc614bd170b2bc4bead0f59464888;hp=4e141c3516a34efc6c0a47adc16810939b0cf3ae;hb=f24884196dac4cffc3ae79cf87cf51d892cda46c;hpb=70a0e44cc77a7d8fc78c5514889bcd5d4fde3599

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 4e141c3..8f392a7 100644
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -5,7 +5,9 @@
  *
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -25,30 +27,28 @@ rmtab_read(void)
 
 	setrmtabent("r");
 	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
+		if (htype == MCL_FQDN || htype == MCL_SUBNETWORK
 		    && (hp = gethostbyname (rep->r_client))
 		    && (hp = hostent_dup (hp),
-			xp = export_allowed (hp, rep->r_path))) {
+			exp = 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);
+			nfs_export *exp2 = export_lookup(rep->r_client,
+							exp->m_export.e_path, 0);
+			if (!exp2) {
+				struct exportent ee;
+				dupexportent(&ee, &exp->m_export);
+				ee.e_hostname = rep->r_client;
+				exp2 = export_create(&ee, 0);
+				exp2->m_changed = exp->m_changed;
 			}
 			free (hp);
-
-			if (!exp)
-				continue;
-			exp->m_mayexport = 1;
+			exp2->m_mayexport = 1;
 		} else if (hp) /* export_allowed failed */
 			free(hp);
 	}