eap-radius: Use the single-server legacy server options as fallback

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
index 1a48c07e5a0f9e5a58086534f8b7e44d4196ad18..5d3540861ce0ad53c1d3f06d9599bda4669a0160 100644 (file)
--- 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,