Make warning about host matching multiple exports more helpful.

[nfs-utils.git] / utils / exportfs / exportfs.c

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 2e2b6f38ca4ba4f9aa7da4d63adc46f8cd8f463c..8c3f634de5984848de3ccc61037774ecbf89f791 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -218,6 +218,7 @@ export_all(int verbose)
                        exp->m_xtabent = 1;
                        exp->m_mayexport = 1;
                        exp->m_changed = 1;
+                       exp->m_warned = 0;
                }
        }
 }
@@ -274,6 +275,7 @@ exportfs(char *arg, char *options, int verbose)
        exp->m_xtabent = 1;
        exp->m_mayexport = 1;
        exp->m_changed = 1;
+       exp->m_warned = 0;
        if (hp) free (hp);
 }
 
@@ -410,15 +412,25 @@ dump(int verbose)
                                c = dumpopt(c, "mountpoint%s%s", 
                                            ep->e_mountpoint[0]?"=":"", 
                                            ep->e_mountpoint);
-                       if (ep->e_maptype == CLE_MAP_UGIDD)
-                               c = dumpopt(c, "mapping=ugidd");
-                       else if (ep->e_maptype == CLE_MAP_FILE)
-                               c = dumpopt(c, "mapping=file");
                        if (ep->e_anonuid != 65534)
                                c = dumpopt(c, "anonuid=%d", ep->e_anonuid);
                        if (ep->e_anongid != 65534)
                                c = dumpopt(c, "anongid=%d", ep->e_anongid);
-
+                       switch(ep->e_fslocmethod) {
+                       case FSLOC_NONE:
+                               break;
+                       case FSLOC_REFER:
+                               c = dumpopt(c, "refer=%s", ep->e_fslocdata);
+                               break;
+                       case FSLOC_REPLICA:
+                               c = dumpopt(c, "replicas=%s", ep->e_fslocdata);
+                               break;
+#ifdef DEBUG
+                       case FSLOC_STUB:
+                               c = dumpopt(c, "fsloc=stub");
+                               break;
+#endif
+                       }
                        printf("%c\n", (c != '(')? ')' : ' ');
                }
        }