From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 25 Feb 2014 09:04:17 +0000 (+0800)
Subject: discover/network: Fix incorrect static DNS servers in resolv.conf
X-Git-Tag: v1.0.0~229
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=9c950743461770220231d320db8c372aa74f9163;ds=sidebyside

discover/network: Fix incorrect static DNS servers in resolv.conf

We currently have a bug where we write NUL characters into
/etc/resolv.conf, when using static DNS server configurations:

With a network setting of: dns,9.0.6.11,9.0.7.1

We generate a resolv.conf containing:

 nameserver 9.0.6.11^@nameserver 9.0.7.1^@

This is due to an off-by-one bug when terminating the nameserver
entries.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/network.c b/discover/network.c
index c300f3d..9acd4cb 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -533,7 +533,7 @@ static void network_init_dns(struct network *network)
 		buf = talloc_realloc(network, buf, char, len + dns_conf_len + 1);
 		memcpy(buf + len, dns_conf, dns_conf_len);
 		len += dns_conf_len;
-		buf[len - 1] = '\0';
+		buf[len] = '\0';
 		modified = true;
 
 		talloc_free(dns_conf);