From: Roy Marples <roy@marples.name>
Date: Fri, 23 Jan 2009 01:20:02 +0000 (+0000)
Subject: Fix a valgrid issue and don't call getifssid unless we are wireless.
X-Git-Tag: v5.0.0~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d471ac1252ff412c6d1be368c41023b141c3ff0;p=thirdparty%2Fdhcpcd.git

Fix a valgrid issue and don't call getifssid unless we are wireless.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 8583b67c..bbe73ed7 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -728,11 +728,14 @@ handle_carrier(const char *ifname)
 		if (iface->carrier != LINK_UP) {
 			iface->carrier = LINK_UP;
 			syslog(LOG_INFO, "%s: carrier acquired", iface->name);
-			/* We need to reconfigre for if ssid changed */
-			getifssid(iface->name, ssid);
-			if (strcmp(iface->ssid, ssid) != 0) {
-				strlcpy(ssid, iface->ssid, sizeof(iface->ssid));
-				configure_interface(iface, margc, margv);
+			if (iface->wireless) {
+				/* We need to reconfigre for if ssid changed */
+				memset(ssid, 0, sizeof(ssid));
+				getifssid(iface->name, ssid);
+				if (strcmp(iface->ssid, ssid) != 0) {
+					strlcpy(iface->ssid, ssid, sizeof(iface->ssid));
+					configure_interface(iface, margc, margv);
+				}
 			}
 			iface->state->reason = "CARRIER";
 			configure(iface);