diff options
| author | sam <sam@FreeBSD.org> | 2005-06-13 17:07:31 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-06-13 17:07:31 +0000 |
| commit | 8637a9a96a3234373c579f38823195a69b770e84 (patch) | |
| tree | 0f94fc92605c2c3570cbf9c5d46a01c7fb65bbf6 /contrib/hostapd/ieee802_1x.c | |
| parent | ef42ed26e06c009171784bf0997f11217b9834eb (diff) | |
| download | FreeBSD-src-8637a9a96a3234373c579f38823195a69b770e84.zip FreeBSD-src-8637a9a96a3234373c579f38823195a69b770e84.tar.gz | |
resolve merge conflicts
Approved by: re (dwhite)
Diffstat (limited to 'contrib/hostapd/ieee802_1x.c')
| -rw-r--r-- | contrib/hostapd/ieee802_1x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/hostapd/ieee802_1x.c b/contrib/hostapd/ieee802_1x.c index 956664a..ef1bde4 100644 --- a/contrib/hostapd/ieee802_1x.c +++ b/contrib/hostapd/ieee802_1x.c @@ -1157,6 +1157,7 @@ ieee802_1x_receive_auth(struct radius_msg *msg, struct radius_msg *req, session_timeout_set ? session_timeout : -1); } + ieee802_1x_store_radius_class(hapd, sta, msg); break; case RADIUS_CODE_ACCESS_REJECT: sm->eapFail = TRUE; @@ -1180,7 +1181,6 @@ ieee802_1x_receive_auth(struct radius_msg *msg, struct radius_msg *req, break; } - ieee802_1x_store_radius_class(hapd, sta, msg); ieee802_1x_decapsulate_radius(hapd, sta); if (override_eapReq) sm->be_auth.eapReq = FALSE; @@ -1669,6 +1669,7 @@ int ieee802_1x_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta, return len; } + void ieee802_1x_finished(struct hostapd_data *hapd, struct sta_info *sta, int success) { @@ -1682,4 +1683,3 @@ void ieee802_1x_finished(struct hostapd_data *hapd, struct sta_info *sta, pmksa_cache_add(hapd, sta, key, dot11RSNAConfigPMKLifetime); } } - |
