diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/exportfs/exportfs.c | 2 | ||||
| -rw-r--r-- | utils/mountd/cache.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 1eca567..8c3f634 100644 --- 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); } diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index ed7fe35..5612a9e 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -520,10 +520,12 @@ void nfsd_export(FILE *f) if (!found) { found = exp; found_type = i; - } else if (found_type == i) { - xlog(L_WARNING, "%s exported to both %s and %s in %s", - path, exp->m_client->m_hostname, found->m_client->m_hostname, + } else if (found_type == i && found->m_warned == 0) { + xlog(L_WARNING, "%s exported to both %s and %s, " + "arbitrarily choosing options from first", + path, found->m_client->m_hostname, exp->m_client->m_hostname, dom); + found->m_warned = 1; } } } |