Commit f12e4e4b authored by Ad Schellevis's avatar Ad Schellevis

don't try to enable legacy Xauth and radius at the same time + fix bug with $ph1ent

parent 4f4791c4
...@@ -700,27 +700,11 @@ EOD; ...@@ -700,27 +700,11 @@ EOD;
} }
$strongswan .= "\t\t}\n"; $strongswan .= "\t\t}\n";
if ($a_client['user_source'] != "none") { $disable_xauth = false;
$strongswan .= "\t\txauth-generic {\n"; foreach ($a_phase1 as $ph1ent) {
$strongswan .= "\t\t\tscript = /usr/local/etc/inc/ipsec.auth-user.php\n"; if (!isset($ph1ent['disabled']) && isset($ph1ent['mobile'])) {
$strongswan .= "\t\t\tauthcfg = ";
$firstsed = 0;
$authcfgs = explode(",", $a_client['user_source']);
foreach ($authcfgs as $authcfg) {
if ($firstsed > 0) {
$strongswan .= ",";
}
if ($authcfg == "system") {
$authcfg = "Local Database";
}
$strongswan .= $authcfg;
$firstsed = 1;
}
$strongswan .= "\n";
$strongswan .= "\t\t}\n";
}
if ($ph1ent['authentication_method'] == "eap-radius") { if ($ph1ent['authentication_method'] == "eap-radius") {
$disable_xauth = true; // disable Xauth when radius is used.
$strongswan .= "\t\teap-radius {\n"; $strongswan .= "\t\teap-radius {\n";
$radius_servers = ""; $radius_servers = "";
$radius_server_num = 1; $radius_server_num = 1;
...@@ -749,6 +733,28 @@ EOD; ...@@ -749,6 +733,28 @@ EOD;
$strongswan .= $radius_servers; $strongswan .= $radius_servers;
$strongswan .= "\t\t\t}\n"; $strongswan .= "\t\t\t}\n";
$strongswan .= "\t\t}\n"; $strongswan .= "\t\t}\n";
break; // there can only be one mobile phase1, exit loop
}
}
}
if ($a_client['user_source'] != "none" && $disable_xauth == false) {
$strongswan .= "\t\txauth-generic {\n";
$strongswan .= "\t\t\tscript = /usr/local/etc/inc/ipsec.auth-user.php\n";
$strongswan .= "\t\t\tauthcfg = ";
$firstsed = 0;
$authcfgs = explode(",", $a_client['user_source']);
foreach ($authcfgs as $authcfg) {
if ($firstsed > 0) {
$strongswan .= ",";
}
if ($authcfg == "system") {
$authcfg = "Local Database";
}
$strongswan .= $authcfg;
$firstsed = 1;
}
$strongswan .= "\n";
$strongswan .= "\t\t}\n";
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment