diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-29 14:56:22 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-29 14:56:22 -0200 |
| commit | 31ec01c3132e6ba124d7b38e6460580974770cfc (patch) | |
| tree | 949dddd7e250a766d859235bba8a6a7ee155d380 /src/usr/local/www/wizards | |
| parent | 473f37a9f4b034cd245e9601005a5e28b97349f1 (diff) | |
| parent | b0b2af901f352dbbaad0b09d06fe7adb105ff7a4 (diff) | |
| download | pfsense-31ec01c3132e6ba124d7b38e6460580974770cfc.zip pfsense-31ec01c3132e6ba124d7b38e6460580974770cfc.tar.gz | |
Merge pull request #3219 from NonSecwitter/patch-2
Diffstat (limited to 'src/usr/local/www/wizards')
| -rw-r--r-- | src/usr/local/www/wizards/setup_wizard.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/wizards/setup_wizard.xml b/src/usr/local/www/wizards/setup_wizard.xml index 9a42871..05da571 100644 --- a/src/usr/local/www/wizards/setup_wizard.xml +++ b/src/usr/local/www/wizards/setup_wizard.xml @@ -573,7 +573,7 @@ <type>input</type> <bindstofield>interfaces->lan->ipaddr</bindstofield> <description>Type dhcp if this interface uses DHCP to obtain its IP address.</description> - <validate>^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$</validate> + <validate>^(dhcp|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/i</validate> <message>LAN IP Address field is invalid</message> </field> <field> @@ -588,7 +588,7 @@ </fields> <stepsubmitphpaction> <![CDATA[ - if (empty($_POST['lanipaddress']) || !is_ipaddr($_POST['lanipaddress'])) { + if (empty($_POST['lanipaddress'])) || (!is_ipaddr($_POST['lanipaddress']) && (strtolower($_POST['lanipaddress']) != "dhcp"))) { print_info_box("Invalid LAN IP address. Please press back in the browser window and correct."); die; } |
