summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/wizards
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2017-05-22 12:24:15 -0400
committerjim-p <jimp@pfsense.org>2017-05-22 12:24:15 -0400
commitbc3669e4e88cb75eb987ee073a5360f4a69b10b1 (patch)
treec40eda26ef4bdb9fa8b8aa463ac062330a51854b /src/usr/local/www/wizards
parentd44942d3477c609e37794dc31c36fcd5c4435fbb (diff)
downloadpfsense-bc3669e4e88cb75eb987ee073a5360f4a69b10b1.zip
pfsense-bc3669e4e88cb75eb987ee073a5360f4a69b10b1.tar.gz
Remove references to unused "Address Pool" setting. The address behavior is now determined by the mode, and has been for years. Fixes #7567
Diffstat (limited to 'src/usr/local/www/wizards')
-rw-r--r--src/usr/local/www/wizards/openvpn_wizard.inc2
-rw-r--r--src/usr/local/www/wizards/openvpn_wizard.xml10
2 files changed, 1 insertions, 11 deletions
diff --git a/src/usr/local/www/wizards/openvpn_wizard.inc b/src/usr/local/www/wizards/openvpn_wizard.inc
index a46f27d..c6fdca0 100644
--- a/src/usr/local/www/wizards/openvpn_wizard.inc
+++ b/src/usr/local/www/wizards/openvpn_wizard.inc
@@ -597,8 +597,6 @@ function step12_submitphpaction() {
$server['duplicate_cn'] = $pconfig['step10']['duplicate_cn'];
if (isset($pconfig['step10']['dynip']))
$server['dynamic_ip'] = $pconfig['step10']['dynip'];
- if (isset($pconfig['step10']['addrpool']))
- $server['pool_enable'] = $pconfig['step10']['addrpool'];
if (isset($pconfig['step10']['defaultdomain']))
$server['dns_domain'] = $pconfig['step10']['defaultdomain'];
if (isset($pconfig['step10']['dns1']))
diff --git a/src/usr/local/www/wizards/openvpn_wizard.xml b/src/usr/local/www/wizards/openvpn_wizard.xml
index 3d898d7..45b6956 100644
--- a/src/usr/local/www/wizards/openvpn_wizard.xml
+++ b/src/usr/local/www/wizards/openvpn_wizard.xml
@@ -782,7 +782,7 @@
<type>input</type>
<size>20</size>
<bindstofield>ovpnserver->step10->tunnelnet</bindstofield>
- <description>This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses can optionally be assigned to connecting clients. (see Address Pool)</description>
+ <description>This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses will be assigned to connecting clients.</description>
</field>
<field>
<displayname>Redirect Gateway</displayname>
@@ -854,14 +854,6 @@
<bindstofield>ovpnserver->step10->dynip</bindstofield>
</field>
<field>
- <displayname>Address Pool</displayname>
- <name>addrpool</name>
- <type>checkbox</type>
- <value>on</value>
- <description>Provide a virtual adapter IP address to clients (see Tunnel Network).</description>
- <bindstofield>ovpnserver->step10->addrpool</bindstofield>
- </field>
- <field>
<displayname>Topology</displayname>
<name>topology</name>
<type>select</type>
OpenPOWER on IntegriCloud