diff options
| author | jim-p <jim@pingle.org> | 2010-04-12 16:11:42 -0400 |
|---|---|---|
| committer | jim-p <jim@pingle.org> | 2010-04-12 16:12:51 -0400 |
| commit | 916fae48c6bf5011475dbcab57310e21cc9907c6 (patch) | |
| tree | 039575e4a4b599a012bb1920c01e500ea996d0dc | |
| parent | 99a00640c02745680b44994cbe194a577490ed2c (diff) | |
| download | pfsense-916fae48c6bf5011475dbcab57310e21cc9907c6.zip pfsense-916fae48c6bf5011475dbcab57310e21cc9907c6.tar.gz | |
OpenVPN Wizard: Fix CA Cert selection for Local auth. Fix descriptions and some backend bits for RADIUS. Ticket #500.
| -rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 9 | ||||
| -rw-r--r-- | usr/local/www/wizards/openvpn_wizard.xml | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index c516707..3ccfb93 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -31,7 +31,7 @@ require_once("openvpn.inc"); function step1_submitphpaction() { global $stepid, $config; if ($_POST['authtype'] == "local") { - $stepid = 5; + $stepid = 4; $config['ovpnserver']['step1']['type'] = "local"; } else if ($_POST['authtype'] == "ldap") { $stepid = 0; @@ -131,8 +131,11 @@ function step4_submitphpaction() { function step5_submitphpaction() { global $stepid, $savemsg, $config; - if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || - empty($_POST['secret'])) { + /* Default RADIUS Auth port = 1812 */ + if (empty($_POST['port'])) + $_POST['port'] = 1812; + + if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['secret'])) { $stepid--; $savemsg = "Please enter all information for authentication server."; } else if (count(($authcfg = auth_get_authserver($_POST['name']))) > 0) { diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml index 28b7ac7..893026c 100644 --- a/usr/local/www/wizards/openvpn_wizard.xml +++ b/usr/local/www/wizards/openvpn_wizard.xml @@ -72,11 +72,11 @@ <fields> <field> <type>listtopic</type> - <name>Authentication Servers list</name> + <name>LDAP Authentication Servers list</name> </field> <field> <name>authserv</name> - <displayname>Authentication servers</displayname> + <displayname>LDAP servers</displayname> <type>select</type> <bindstofield>ovpnserver->step2->authserv</bindstofield> <options> @@ -232,11 +232,11 @@ <fields> <field> <type>listtopic</type> - <name>Authentication Servers list</name> + <name>RADIUS Authentication Servers list</name> </field> <field> <name>authserv</name> - <displayname>Authentication servers</displayname> + <displayname>RADIUS servers</displayname> <type>select</type> <bindstofield>ovpnserver->step2->authserv</bindstofield> <options> @@ -274,12 +274,14 @@ <displayname>Name</displayname> <type>input</type> <bindstofield>ovpnserver->step2->authtype</bindstofield> + <description>Descriptive name for the RADIUS server, for your reference.</description> </field> <field> <name>ip</name> <displayname>Hostname or IP address</displayname> <type>input</type> <bindstofield>ovpnserver->step2->ip</bindstofield> + <description>Address of the RADIUS server.</description> </field> <field> <name>port</name> @@ -287,6 +289,7 @@ <type>input</type> <size>8</size> <bindstofield>ovpnserver->step2->port</bindstofield> + <description>Port used by the RADIUS server for accepting Authentication requests, typically 1812.</description> </field> <field> <name>secret</name> @@ -294,6 +297,7 @@ <type>password</type> <size>20</size> <bindstofield>ovpnserver->step2->password</bindstofield> + <description></description> </field> <field> <name>Add new Server</name> |
