colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: don't need secrets if the connection says we don't

Browse Source
This commit is contained in:
Dan Williams
2011-02-02 16:17:10 -06:00
parent 76aabe4b72
commit dc78aa19c9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nm-device-wifi.c
View File

@@ -2711,6 +2711,7 @@ handle_auth_or_fail (NMDeviceWifi *self,
guint32 tries; guint32 tries;
NMAccessPoint *ap; NMAccessPoint *ap;
NMConnection *connection; NMConnection *connection;
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
g_return_val_if_fail (NM_IS_DEVICE_WIFI (self), NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_DEVICE_WIFI (self), NM_ACT_STAGE_RETURN_FAILURE);
@@ -2744,10 +2745,11 @@ handle_auth_or_fail (NMDeviceWifi *self,
nm_act_request_get_secrets (req, setting_name, flags, NULL, wifi_secrets_cb, self); nm_act_request_get_secrets (req, setting_name, flags, NULL, wifi_secrets_cb, self);
g_object_set_data (G_OBJECT (connection), WIRELESS_SECRETS_TRIES, GUINT_TO_POINTER (++tries)); g_object_set_data (G_OBJECT (connection), WIRELESS_SECRETS_TRIES, GUINT_TO_POINTER (++tries));
} else { ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else
nm_log_warn (LOGD_DEVICE, "Cleared secrets, but setting didn't need any secrets."); nm_log_warn (LOGD_DEVICE, "Cleared secrets, but setting didn't need any secrets.");
}
return NM_ACT_STAGE_RETURN_POSTPONE; return ret;
} }
/* /*