Fix handling of explicit uuid

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 4aead6c3861864d1d42b25404d1df210483457ba..2ebdd45b2007be60923cb5343c73c40c8728ba42 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -111,7 +111,7 @@ void auth_unix_ip(FILE *f)
        else if (client)
                qword_print(f, *client?client:"DEFAULT");
        qword_eol(f);
-       xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, *client?client: "DEFAULT");
+       xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        if (client) free(client);
        free(he);
@@ -158,8 +158,10 @@ void auth_unix_gid(FILE *f)
                qword_printint(f, ngroups);
                for (i=0; i<ngroups; i++)
                        qword_printint(f, groups[i]);
-       }
+       } else
+               qword_printint(f, 0);
        qword_eol(f);
+
        if (groups != glist)
                free(groups);
 }
@@ -184,8 +186,6 @@ int get_uuid(char *path, char *uuid, int uuidlen, char *u)
                if (cache == NULL)
                        blkid_get_cache(&cache, NULL);
 
-               blkid_probe_all_new(cache);
-
                if (stat(path, &stb) != 0)
                        return 0;
                devname = blkid_devno_to_devname(stb.st_dev);
@@ -516,8 +516,10 @@ void nfsd_fh(FILE *f)
                qword_print(f, found_path);
        qword_eol(f);
  out:
-       free(found_path);
-       free(he);
+       if (found_path)
+               free(found_path);
+       if (he)
+               free(he);
        free(dom);
        xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
        return;         
@@ -590,8 +592,10 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
                                qword_printhex(f, u, 16);
                        }
                } else {
+                       char u[16];
+                       get_uuid(NULL, exp->e_uuid, 16, u);
                        qword_print(f, "uuid");
-                       qword_printhex(f, exp->e_uuid, 16);
+                       qword_printhex(f, u, 16);
                }
 #endif
        }
@@ -667,9 +671,9 @@ void nfsd_export(FILE *f)
                        }
                        /* If one is a CROSSMOUNT, then prefer the longest path */
                        if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) ||
-                            (found->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
+                            (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
                            strlen(found->m_export.e_path) !=
-                           strlen(found->m_export.e_path)) {
+                           strlen(exp->m_export.e_path)) {
 
                                if (strlen(exp->m_export.e_path) >
                                    strlen(found->m_export.e_path)) {