X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmountd%2Fcache.c;h=8de2eac383acfe3c74566b6608761506adc1b46c;hb=a8dcaa282122b5db8f4ffb7e5d99b2c4b62cbb78;hp=1ae96fe41ecca26e0ff6d7003137b520f6c1ddbc;hpb=c2544b77566690ebec32a2d47c9249548b1a0941;p=nfs-utils.git

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 1ae96fe..8de2eac 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -84,7 +84,6 @@ static void auth_unix_ip(FILE *f)
 	char ipaddr[INET6_ADDRSTRLEN];
 	char *client = NULL;
 	struct addrinfo *tmp = NULL;
-	struct addrinfo *ai = NULL;
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
 		return;
 
@@ -107,12 +106,16 @@ static void auth_unix_ip(FILE *f)
 
 	/* addr is a valid, interesting address, find the domain name... */
 	if (!use_ipaddr) {
+		struct addrinfo *ai = NULL;
+
 		ai = client_resolve(tmp->ai_addr);
+		if (ai == NULL)
+			goto out;
 		client = client_compose(ai);
 		freeaddrinfo(ai);
+		if (!client)
+			goto out;
 	}
-	freeaddrinfo(tmp);
-
 	qword_print(f, "nfsd");
 	qword_print(f, ipaddr);
 	qword_printuint(f, time(0) + DEFAULT_TTL);
@@ -124,6 +127,9 @@ static void auth_unix_ip(FILE *f)
 	xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
 	free(client);
+out:
+	freeaddrinfo(tmp);
+
 }
 
 static void auth_unix_gid(FILE *f)
@@ -911,14 +917,15 @@ out_false:
  *
  * Returned exportent points to static memory.
  */
-static struct exportent *do_locations_to_export(struct jp_ops *ops,
-		nfs_fsloc_set_t locations, const char *junction,
-		char *options, size_t options_len)
+static struct exportent *locations_to_export(struct jp_ops *ops,
+		nfs_fsloc_set_t locations, const char *junction)
 {
+	static char options[BUFSIZ];
 	struct exportent *exp;
 	int ttl;
 
-	if (!locations_to_options(ops, locations, options, options_len, &ttl))
+	options[0] = '\0';
+	if (!locations_to_options(ops, locations, options, sizeof(options), &ttl))
 		return NULL;
 
 	exp = mkexportent("*", (char *)junction, options);
@@ -932,33 +939,6 @@ static struct exportent *do_locations_to_export(struct jp_ops *ops,
 	return exp;
 }
 
-/*
- * Convert set of FS locations to an exportent.  Returns pointer to
- * an exportent if "junction" refers to a junction.
- *
- * Returned exportent points to static memory.
- */
-static struct exportent *locations_to_export(struct jp_ops *ops,
-		nfs_fsloc_set_t locations, const char *junction)
-{
-	struct exportent *exp;
-	char *options;
-
-	options = malloc(BUFSIZ);
-	if (options == NULL) {
-		xlog(D_GENERAL, "%s: failed to allocate options buffer",
-			__func__);
-		return NULL;
-	}
-	options[0] = '\0';
-
-	exp = do_locations_to_export(ops, locations, junction,
-						options, BUFSIZ);
-
-	free(options);
-	return exp;
-}
-
 /*
  * Retrieve locations information in "junction" and dump it to the
  * kernel.  Returns pointer to an exportent if "junction" refers
@@ -969,8 +949,8 @@ static struct exportent *locations_to_export(struct jp_ops *ops,
 static struct exportent *invoke_junction_ops(void *handle,
 		const char *junction)
 {
+	struct exportent *exp = NULL;
 	nfs_fsloc_set_t locations;
-	struct exportent *exp;
 	enum jp_status status;
 	struct jp_ops *ops;
 	char *error;
@@ -996,15 +976,24 @@ static struct exportent *invoke_junction_ops(void *handle,
 	}
 
 	status = ops->jp_get_locations(junction, &locations);
-	if (status != JP_OK) {
-		xlog(D_GENERAL, "%s: failed to resolve %s: %s",
-			__func__, junction, ops->jp_error(status));
-		return NULL;
+	switch (status) {
+	case JP_OK:
+		break;
+	case JP_NOTJUNCTION:
+		xlog(D_GENERAL, "%s: %s is not a junction",
+			__func__, junction);
+		goto out;
+	default:
+		xlog(L_WARNING, "Dangling junction %s: %s",
+			junction, ops->jp_error(status));
+		goto out;
 	}
 
 	exp = locations_to_export(ops, locations, junction);
 
 	ops->jp_put_locations(locations);
+
+out:
 	ops->jp_done();
 	return exp;
 }