From: Roy Marples <roy@marples.name>
Date: Fri, 1 Aug 2008 17:42:38 +0000 (+0000)
Subject: Fix dhcp message logging.
X-Git-Tag: v4.0.2~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2a1ad13706b29461284d8aed7f2cdb3e1c0c382;p=thirdparty%2Fdhcpcd.git

Fix dhcp message logging.
---

diff --git a/client.c b/client.c
index f2a71ff3..237dd9e1 100644
--- a/client.c
+++ b/client.c
@@ -1355,26 +1355,25 @@ dhcp_timeout:
 static void
 log_dhcp(int lvl, const char *msg, const struct dhcp_message *dhcp)
 {
-	char *addr;
-	struct in_addr server;
+	char *a;
+	struct in_addr addr;
 	int r;
 
-	r = get_option_addr(&server.s_addr, dhcp, DHCP_SERVERID);
 	if (strcmp(msg, "NAK:") == 0)
-		addr = get_option_string(dhcp, DHCP_MESSAGE);
+		a = get_option_string(dhcp, DHCP_MESSAGE);
 	else {
-		server.s_addr = dhcp->yiaddr;
-		addr = xstrdup(inet_ntoa(server));
+		addr.s_addr = dhcp->yiaddr;
+		a = xstrdup(inet_ntoa(addr));
 	}
+	r = get_option_addr(&addr.s_addr, dhcp, DHCP_SERVERID);
 	if (dhcp->servername[0] && r == 0)
-		logger(lvl, "%s %s from %s `%s'", msg,
-		       addr, inet_ntoa(server),
-		       dhcp->servername);
+		logger(lvl, "%s %s from %s `%s'", msg, a,
+		       inet_ntoa(addr), dhcp->servername);
 	else if (r == 0)
-		logger(lvl, "%s %s from %s", msg, addr, inet_ntoa(server));
+		logger(lvl, "%s %s from %s", msg, a, inet_ntoa(addr));
 	else
-		logger(lvl, "%s %s", msg, addr);
-	free(addr);
+		logger(lvl, "%s %s", msg, a);
+	free(a);
 }
 
 static int