X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Frmtab.c;h=58e59f4e111da0d784a4f4ab6d40c5ab128a3532;hp=4d0bc028e8dd0aa55ee863fe3eb6e99f55291331;hb=a980156c122e975cc185a6c41ef705f166a5765f;hpb=acc4cade1891c0b07f3e0016ff3c5b604b042c86

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 4d0bc02..58e59f4 100644
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -24,8 +24,7 @@ rmtab_read(void)
 	nfs_export		*exp;
 
 	setrmtabent("r");
-	while ((rep = getrmtabent(1)) != NULL) {
-		struct exportent	*xp;
+	while ((rep = getrmtabent(1, NULL)) != NULL) {
 		struct hostent		*hp = NULL;
 		int			htype;
 		
@@ -33,22 +32,23 @@ rmtab_read(void)
 		if (htype == MCL_FQDN
 		    && (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);
+				strncpy (ee.e_hostname, rep->r_client,
+					 sizeof (ee.e_hostname) - 1);
+				ee.e_hostname[sizeof (ee.e_hostname) -1] = '\0';
+				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);
 	}
@@ -65,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",