From 5f2e5c8e30fcf82181341dce26beda27a49ccff7 Mon Sep 17 00:00:00 2001 From: jim-p Date: Sat, 8 May 2010 14:34:45 -0400 Subject: [PATCH] Remove remote network from wizard, it is not used for a Remote Access VPN. --- usr/local/www/wizards/openvpn_wizard.inc | 5 ----- usr/local/www/wizards/openvpn_wizard.xml | 8 -------- 2 files changed, 13 deletions(-) diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index 41189e13f9..0ccae60c29 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -337,9 +337,6 @@ function step10_submitphpaction() { if ($result = openvpn_validate_cidr($_POST['tunnelnet'], 'Tunnel network')) $input_errors[] = $result; - if ($result = openvpn_validate_cidr($_POST['remotenet'], 'Remote network')) - $input_errors[] = $result; - if ($result = openvpn_validate_cidr($_POST['localnet'], 'Local network')) $input_errors[] = $result; @@ -530,8 +527,6 @@ function step12_submitphpaction() { $server['gwredir'] = $pconfig['step10']['rdrgw']; if (isset($pconfig['step10']['localnet'])) $server['local_network'] = $pconfig['step10']['localnet']; - if (isset($pconfig['step10']['remotenet'])) - $server['remote_network'] = $pconfig['step10']['remotenet']; if (isset($pconfig['step10']['concurrentcon'])) $server['maxclients'] = $pconfig['step10']['concurrentcon']; if (isset($pconfig['step10']['compression'])) diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml index 01d5d57bc2..f790f7bda4 100644 --- a/usr/local/www/wizards/openvpn_wizard.xml +++ b/usr/local/www/wizards/openvpn_wizard.xml @@ -715,14 +715,6 @@ ovpnserver->step10->localnet This is the network that will be accessible from the remote endpoint, expressed as a CIDR range. You may leave this blank if you don't want to add a route to the local network through this tunnel on the remote machine. This is generally set to your LAN network. - - Remote Network - remotenet - input - 20 - ovpnserver->step10->remotenet - This is a network that will be routed through the tunnel, so that a site-to-site VPN can be established without manually changing the routing tables. Expressed as a CIDR range. If this is a site-to-site VPN, enter the remote LAN here. You may leave this blank if you don't want a site-to-site VPN. - Concurrent Connections concurrentcon