From: Roy Marples <roy@marples.name>
Date: Fri, 11 Mar 2011 12:25:01 +0000 (+0000)
Subject: Exclude interface specific values when dumping the lease.
X-Git-Tag: v5.2.12~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7cf2dbcc0a8ce680b003dcfaa42b7d9dde468d8;p=thirdparty%2Fdhcpcd.git

Exclude interface specific values when dumping the lease.
---

diff --git a/configure.c b/configure.c
index fb28669b..01d0f813 100644
--- a/configure.c
+++ b/configure.c
@@ -170,8 +170,14 @@ make_env(const struct interface *iface, char ***argv)
 	const struct if_options *ifo = iface->state->options;
 	const struct interface *ifp;
 
+	/* When dumping the lease, we only want to report interface and
+	   reason - the other interface variables are meaningless */
+	if (options & DHCPCD_DUMPLEASE)
+		elen = 2;
+	else
+		elen = 8;
+
 	/* Make our env */
-	elen = 8;
 	env = xmalloc(sizeof(char *) * (elen + 1));
 	e = strlen("interface") + strlen(iface->name) + 2;
 	env[0] = xmalloc(e);
@@ -179,7 +185,10 @@ make_env(const struct interface *iface, char ***argv)
 	e = strlen("reason") + strlen(iface->state->reason) + 2;
 	env[1] = xmalloc(e);
 	snprintf(env[1], e, "reason=%s", iface->state->reason);
-	e = 20;
+	if (options & DHCPCD_DUMPLEASE)
+		goto dumplease;
+
+ 	e = 20;
 	env[2] = xmalloc(e);
 	snprintf(env[2], e, "pid=%d", getpid());
 	env[3] = xmalloc(e);
@@ -237,6 +246,8 @@ make_env(const struct interface *iface, char ***argv)
 		append_config(&env, &elen, "old",
 		    (const char *const *)ifo->config);
 	}
+
+dumplease:
 	if (iface->state->new) {
 		e = configure_env(NULL, NULL, iface->state->new, ifo);
 		if (e > 0) {