X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fcache.c;h=f555dcc69684c83b60e8da7345224c0c893eb149;hp=4aead6c3861864d1d42b25404d1df210483457ba;hb=3c1bb23c0379864722e79d19f74c180edcf2c36e;hpb=2d77e3a27b7b211f303fcc3a813a044838dad970

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 4aead6c..f555dcc 100644
--- 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);
@@ -184,8 +184,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 +514,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;		
@@ -667,9 +667,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)) {