diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-08 10:20:04 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-08 10:20:04 -0300 |
| commit | 8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b (patch) | |
| tree | cecf571643c08858880695d453d4f199649423f9 /usr/local/www/services_dhcp.php | |
| parent | 86385ef36f81052afc3febdbce3a3af49373c7a6 (diff) | |
| parent | 245da5436bc5a30d6c65d68dbd54a56dca1ec896 (diff) | |
| download | pfsense-8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b.zip pfsense-8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/filter.inc
etc/inc/pkg-utils.inc
etc/inc/service-utils.inc
etc/inc/system.inc
etc/inc/vpn.inc
Diffstat (limited to 'usr/local/www/services_dhcp.php')
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 152877d..e2ce65b 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -233,7 +233,7 @@ if ($_POST) { $input_errors[] = gettext("A valid IP address must be specified for the primary/secondary NTP servers."); if (($_POST['domain'] && !is_domain($_POST['domain']))) $input_errors[] = gettext("A valid domain name must be specified for the DNS domain."); - if (($_POST['tftp'] && (!is_ipaddr($_POST['tftp']) && !is_domain($_POST['tftp'])))) + if ($_POST['tftp'] && !is_ipaddr($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp'])) $input_errors[] = gettext("A valid IP address or hostname must be specified for the TFTP server."); if (($_POST['nextserver'] && !is_ipaddr($_POST['nextserver']))) $input_errors[] = gettext("A valid IP address must be specified for the network boot server."); |
