From 9e577ba84c852441bf1bc7b619e013177b8428a8 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 17 Oct 2005 15:36:26 +0000 Subject: [PATCH] 2005-10-17 Christopher Aillon * src/NetworkManagerDevice.c: (process_scan_results) Fix logic that checks to see whether we have an ESSID. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1026 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/NetworkManagerDevice.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b65ea12678..4a048302e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-17 Christopher Aillon + + * src/NetworkManagerDevice.c: (process_scan_results) + Fix logic that checks to see whether we have an ESSID. + 2005-10-15 Dan Williams Move scanning code into NetworkManager rather than use iwlib's diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index 4a72e4ad80..de32232357 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -4602,7 +4602,9 @@ static gboolean process_scan_results (NMDevice *dev, const guint8 *res_buf, guin char *essid = g_malloc (IW_ESSID_MAX_SIZE + 1); memcpy (essid, custom, ssid_len); essid[ssid_len] = '\0'; - if ((strlen (essid) >= 8) && (strcmp (essid, "") != 0)) /* Stupid ipw drivers use */ + if (!strlen(essid)) + set = FALSE; + else if ((strlen (essid) == 8) && (strcmp (essid, "") == 0)) /* Stupid ipw drivers use */ set = FALSE; if (set) nm_ap_set_essid (ap, essid);