From: Roy Marples <roy@marples.name>
Date: Sat, 11 Jul 2009 15:14:31 +0000 (+0000)
Subject: Don't print (null) when there is no NAK message.
X-Git-Tag: v5.0.7~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321898d72132db54f2bc3c2f76cecf3e49a37b43;p=thirdparty%2Fdhcpcd.git

Don't print (null) when there is no NAK message.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index a08bd2d7..d94d606f 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -409,10 +409,14 @@ log_dhcp(int lvl, const char *msg,
 	if (dhcp->servername[0] && r == 0)
 		syslog(lvl, "%s: %s %s from %s `%s'", iface->name, msg, a,
 		    inet_ntoa(addr), dhcp->servername);
-	else if (r == 0)
-		syslog(lvl, "%s: %s %s from %s",
-		    iface->name, msg, a, inet_ntoa(addr));
-	else if (a != NULL)
+	else if (r == 0) {
+		if (a == NULL)
+			syslog(lvl, "%s: %s from %s",
+			    iface->name, msg, inet_ntoa(addr));
+		else
+			syslog(lvl, "%s: %s %s from %s",
+			    iface->name, msg, a, inet_ntoa(addr));
+	} else if (a != NULL)
 		syslog(lvl, "%s: %s %s", iface->name, msg, a);
 	else
 		syslog(lvl, "%s: %s", iface->name, msg);