diff options
author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-04-28 21:17:27 -0600 |
---|---|---|
committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-04-28 21:17:27 -0600 |
commit | c3c2fd205b1563976a278bd11396d055d7818d27 (patch) | |
tree | ae0316ca6b0c8423c35fe22cfa1e8bcaf30cdd55 /usr/local/www/wizards/openvpn_wizard.inc | |
parent | 39c0be7b5f387dffa7cbbb3dff3f2be46e6b504f (diff) | |
parent | 1364604bb503b02e80240bda728e154394271b9c (diff) | |
download | pfsense-c3c2fd205b1563976a278bd11396d055d7818d27.zip pfsense-c3c2fd205b1563976a278bd11396d055d7818d27.tar.gz |
Merge branch 'master' into gettext
Resolved conflicts:
usr/local/www/system_advanced_firewall.php
usr/local/www/system_routes.php
usr/local/www/system_routes_edit.php
Diffstat (limited to 'usr/local/www/wizards/openvpn_wizard.inc')
-rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index eea1a85..9be787c 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -538,6 +538,8 @@ function step12_submitphpaction() { $server['passtos'] = $pconfig['step10']['tos']; if (isset($pconfig['step10']['interclient'])) $server['client2client'] = $pconfig['step10']['interclient']; + 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'])) |