From: Roy Marples <roy@marples.name>
Date: Thu, 6 Mar 2014 19:30:30 +0000 (+0000)
Subject: Fix assignment error from strcpy removal.
X-Git-Tag: v6.3.2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a243eb205f92d2cb23c83bb52ef865532b61b7a;p=thirdparty%2Fdhcpcd.git

Fix assignment error from strcpy removal.
---

diff --git a/dhcp6.c b/dhcp6.c
index b13720b8..8df9392c 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -2854,7 +2854,7 @@ dhcp6_env(char **env, const char *prefix, const struct interface *ifp,
 					syslog(LOG_ERR, "%s: %m", __func__);
 					return -1;
 				}
-				i = snprintf(val, l, "%s_dhcp6_prefix=",
+				i = snprintf(v, l, "%s_dhcp6_prefix=",
 				    prefix);
 				v += i;
 				l -= i;
@@ -2877,8 +2877,10 @@ dhcp6_env(char **env, const char *prefix, const struct interface *ifp,
 					syslog(LOG_ERR, "%s: %m", __func__);
 					return -1;
 				}
-				i = snprintf(val, l, "%s_dhcp6_ip_address=",
+				i = snprintf(v, l, "%s_dhcp6_ip_address=",
 				    prefix);
+				v += i;
+				l -= i;
 				TAILQ_FOREACH(ap, &state->addrs, next) {
 					i = strlen(ap->saddr);
 					strlcpy(v, ap->saddr, l);