diff options
| author | Martin Willi <martin@revosec.ch> | 2014-12-11 12:29:53 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-12-12 10:23:59 +0100 |
| commit | 971ef077cecf58856eddd46458f0379c7620757c (patch) | |
| tree | 82c1bbf356460b1321e64cd60d006733684c33b9 | |
| parent | 443346f56aeb9cbab9f7331137041e5301dea856 (diff) | |
| download | strongswan-971ef077cecf58856eddd46458f0379c7620757c.tar.bz2 strongswan-971ef077cecf58856eddd46458f0379c7620757c.tar.xz | |
eap-radius: Use the single-server legacy server options as fallback
| -rw-r--r-- | src/libcharon/plugins/eap_radius/eap_radius_plugin.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c index 1a48c07e5..5d3540861 100644 --- a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c +++ b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c @@ -149,19 +149,26 @@ static void load_configs(private_eap_radius_plugin_t *this) continue; } nas_identifier = lib->settings->get_str(lib->settings, - "%s.plugins.eap-radius.servers.%s.nas_identifier", "strongSwan", + "%s.plugins.eap-radius.servers.%s.nas_identifier", + lib->settings->get_str(lib->settings, + "%s.plugins.eap-radius.nas_identifier", "strongSwan", + lib->ns), lib->ns, section); auth_port = lib->settings->get_int(lib->settings, "%s.plugins.eap-radius.servers.%s.auth_port", lib->settings->get_int(lib->settings, "%s.plugins.eap-radius.servers.%s.port", - AUTH_PORT, lib->ns, section), + lib->settings->get_int(lib->settings, + "%s.plugins.eap-radius.port", AUTH_PORT, lib->ns), + lib->ns, section), lib->ns, section); acct_port = lib->settings->get_int(lib->settings, "%s.plugins.eap-radius.servers.%s.acct_port", ACCT_PORT, lib->ns, section); sockets = lib->settings->get_int(lib->settings, - "%s.plugins.eap-radius.servers.%s.sockets", 1, + "%s.plugins.eap-radius.servers.%s.sockets", + lib->settings->get_int(lib->settings, + "%s.plugins.eap-radius.sockets", 1, lib->ns), lib->ns, section); preference = lib->settings->get_int(lib->settings, "%s.plugins.eap-radius.servers.%s.preference", 0, |