mountd: trivial: name parameters for clarity

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 2468bc5916084e06323341ed6aeab006378beef9..6343325b106395767c1c781cbf71f76303564555 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -125,7 +125,7 @@ void auth_unix_gid(FILE *f)
         * reply is
         *  uid expiry count list of group ids
         */
-       int uid;
+       uid_t uid;
        struct passwd *pw;
        gid_t glist[100], *groups = glist;
        int ngroups = 100;
@@ -136,7 +136,7 @@ void auth_unix_gid(FILE *f)
                return;
 
        cp = lbuf;
-       if (qword_get_int(&cp, &uid) != 0)
+       if (qword_get_uint(&cp, &uid) != 0)
                return;
 
        pw = getpwuid(uid);
@@ -153,14 +153,14 @@ void auth_unix_gid(FILE *f)
                                                  groups, &ngroups);
                }
        }
-       qword_printint(f, uid);
-       qword_printint(f, time(0)+30*60);
+       qword_printuint(f, uid);
+       qword_printuint(f, time(0)+30*60);
        if (rv >= 0) {
-               qword_printint(f, ngroups);
+               qword_printuint(f, ngroups);
                for (i=0; i<ngroups; i++)
-                       qword_printint(f, groups[i]);
+                       qword_printuint(f, groups[i]);
        } else
-               qword_printint(f, 0);
+               qword_printuint(f, 0);
        qword_eol(f);
 
        if (groups != glist)
@@ -614,12 +614,12 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
        return qword_eol(f);
 }
 
-static int is_subdirectory(char *subpath, char *path)
+static int is_subdirectory(char *child, char *parent)
 {
-       int l = strlen(path);
+       int l = strlen(parent);
 
-       return strcmp(subpath, path) == 0
-               || (strncmp(subpath, path, l) == 0 && path[l] == '/');
+       return strcmp(child, parent) == 0
+               || (strncmp(child, parent, l) == 0 && child[l] == '/');
 }
 
 static int path_matches(nfs_export *exp, char *path)
@@ -657,6 +657,11 @@ static nfs_export *lookup_export(char *dom, char *path, struct hostent *he)
                                found_type = i;
                                continue;
                        }
+
+                       /* Always prefer non-V4ROOT mounts */
+                       if (found->m_export.e_flags & NFSEXP_V4ROOT)
+                               continue;
+
                        /* If one is a CROSSMOUNT, then prefer the longest path */
                        if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) ||
                             (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&