diff options
author | gnhb <gnoahb@gmail.com> | 2010-05-12 19:27:12 +0700 |
---|---|---|
committer | gnhb <gnoahb@gmail.com> | 2010-05-12 19:27:12 +0700 |
commit | 37df6d7b15905be3dd198d9c17f19a1697beea9f (patch) | |
tree | ef071adda82633630b88de0041b20f757c82bb89 /usr/local/www/wizards/openvpn_wizard.inc | |
parent | 04d36b1f1fdff85cd902b9aa15103b98475b4777 (diff) | |
parent | e256e9d4d1dedb1418204d2879c7dcf7edcf2137 (diff) | |
download | pfsense-37df6d7b15905be3dd198d9c17f19a1697beea9f.zip pfsense-37df6d7b15905be3dd198d9c17f19a1697beea9f.tar.gz |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/upgrade_config.inc
Diffstat (limited to 'usr/local/www/wizards/openvpn_wizard.inc')
-rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index 41189e1..0ccae60 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'])) |