diff options
author | sam <sam@FreeBSD.org> | 2006-03-07 05:51:52 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2006-03-07 05:51:52 +0000 |
commit | 7ec4eb033d83d1150a5d461349c32d7113770a57 (patch) | |
tree | 4c08a6b60d0fad8945a0348eb843f0d8b2bd8d9d /contrib/hostapd/eap.h | |
parent | 8410a7ea6cb51f8974a9d5506dacff8d565158f5 (diff) | |
download | FreeBSD-src-7ec4eb033d83d1150a5d461349c32d7113770a57.zip FreeBSD-src-7ec4eb033d83d1150a5d461349c32d7113770a57.tar.gz |
resolve merge conflicts
MFC after: 2 weeks
Diffstat (limited to 'contrib/hostapd/eap.h')
-rw-r--r-- | contrib/hostapd/eap.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/hostapd/eap.h b/contrib/hostapd/eap.h index c79bffe..ce49b07 100644 --- a/contrib/hostapd/eap.h +++ b/contrib/hostapd/eap.h @@ -32,6 +32,7 @@ struct eapol_callbacks { size_t eapKeyDataLen); int (*get_eap_user)(void *ctx, const u8 *identity, size_t identity_len, int phase2, struct eap_user *user); + const char * (*get_eap_req_id_text)(void *ctx, size_t *len); }; struct eap_config { @@ -41,7 +42,7 @@ struct eap_config { }; -#ifdef EAP_AUTHENTICATOR +#ifdef EAP_SERVER struct eap_sm * eap_sm_init(void *eapol_ctx, struct eapol_callbacks *eapol_cb, struct eap_config *eap_conf); @@ -52,7 +53,7 @@ void eap_set_eapRespData(struct eap_sm *sm, const u8 *eapRespData, size_t eapRespDataLen); void eap_sm_notify_cached(struct eap_sm *sm); -#else /* EAP_AUTHENTICATOR */ +#else /* EAP_SERVER */ static inline struct eap_sm * eap_sm_init(void *eapol_ctx, struct eapol_callbacks *eapol_cb, @@ -85,6 +86,6 @@ static inline void eap_sm_notify_cached(struct eap_sm *sm) { } -#endif /* EAP_AUTHENTICATOR */ +#endif /* EAP_SERVER */ #endif /* EAP_H */ |