Don't complain if two exports of different types match the same IP address.

[nfs-utils.git] / utils / mountd / cache.c

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 4693216f949e1751ccf61239e9f9296b794827f1..ed7fe3534ad3e5ae4ffff535b434913f221812b8 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -490,6 +490,7 @@ void nfsd_export(FILE *f)
        int i;
        char *dom, *path;
        nfs_export *exp, *found = NULL;
+       int found_type = 0;
 
 
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
@@ -516,9 +517,10 @@ void nfsd_export(FILE *f)
                                continue;
                        if (strcmp(path, exp->m_export.e_path))
                                continue;
-                       if (!found)
+                       if (!found) {
                                found = exp;
-                       else {
+                               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,
                                     dom);
@@ -612,12 +614,6 @@ int cache_export(nfs_export *exp)
        int err;
        FILE *f;
 
-       if (exp->m_export.e_maptype != CLE_MAP_IDENT) {
-               xlog(L_ERROR, "%s: unsupported mapping; kernel supports only 'identity' (default)",
-                   exp->m_export.m_path);
-               return -1;
-       }
-
        f = fopen("/proc/net/rpc/auth.unix.ip/channel", "w");
        if (!f)
                return -1;