ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/vendor/wpa/dist/src/ap/authsrv.c
(Generate patch)

Comparing vendor/wpa/dist/src/ap/authsrv.c (file contents):
Revision 9638 by laffer1, Sun Oct 22 18:04:47 2017 UTC vs.
Revision 9639 by laffer1, Sun Oct 22 18:11:47 2017 UTC

# Line 2 | Line 2
2   * Authentication server setup
3   * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
4   *
5 < * This program is free software; you can redistribute it and/or modify
6 < * it under the terms of the GNU General Public License version 2 as
7 < * published by the Free Software Foundation.
8 < *
9 < * Alternatively, this software may be distributed under the terms of BSD
10 < * license.
11 < *
12 < * See README and COPYING for more details.
5 > * This software may be distributed under the terms of the BSD license.
6 > * See README for more details.
7   */
8  
9   #include "utils/includes.h"
# Line 60 | Line 54 | static int hostapd_radius_get_eap_user(void *ctx, cons
54                                         struct eap_user *user)
55   {
56          const struct hostapd_eap_user *eap_user;
57 <        int i, count;
57 >        int i;
58  
59          eap_user = hostapd_get_eap_user(ctx, identity, identity_len, phase2);
60          if (eap_user == NULL)
# Line 70 | Line 64 | static int hostapd_radius_get_eap_user(void *ctx, cons
64                  return 0;
65  
66          os_memset(user, 0, sizeof(*user));
67 <        count = EAP_USER_MAX_METHODS;
74 <        if (count > EAP_MAX_METHODS)
75 <                count = EAP_MAX_METHODS;
76 <        for (i = 0; i < count; i++) {
67 >        for (i = 0; i < EAP_MAX_METHODS; i++) {
68                  user->methods[i].vendor = eap_user->methods[i].vendor;
69                  user->methods[i].method = eap_user->methods[i].method;
70          }
# Line 101 | Line 92 | static int hostapd_setup_radius_srv(struct hostapd_dat
92          os_memset(&srv, 0, sizeof(srv));
93          srv.client_file = conf->radius_server_clients;
94          srv.auth_port = conf->radius_server_auth_port;
95 <        srv.conf_ctx = conf;
95 >        srv.conf_ctx = hapd;
96          srv.eap_sim_db_priv = hapd->eap_sim_db_priv;
97          srv.ssl_ctx = hapd->ssl_ctx;
98          srv.msg_ctx = hapd->msg_ctx;
# Line 119 | Line 110 | static int hostapd_setup_radius_srv(struct hostapd_dat
110          srv.get_eap_user = hostapd_radius_get_eap_user;
111          srv.eap_req_id_text = conf->eap_req_id_text;
112          srv.eap_req_id_text_len = conf->eap_req_id_text_len;
113 +        srv.pwd_group = conf->pwd_group;
114 + #ifdef CONFIG_RADIUS_TEST
115 +        srv.dump_msk_file = conf->dump_msk_file;
116 + #endif /* CONFIG_RADIUS_TEST */
117  
118          hapd->radius_srv = radius_server_init(&srv);
119          if (hapd->radius_srv == NULL) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines