diff options
| author | k-paulius <k.dash.paulius@gmail.com> | 2015-03-23 16:32:23 -0500 |
|---|---|---|
| committer | k-paulius <k.dash.paulius@gmail.com> | 2015-03-23 16:32:23 -0500 |
| commit | 9329ec085be8d176bb9366f5ea24dae05760a9ac (patch) | |
| tree | c53f8081fa51aa281f18bc3a7631f8c790edf72a /etc | |
| parent | fc1f2003c033674d95d06ddb9f8c79f1b38458f1 (diff) | |
| download | pfsense-9329ec085be8d176bb9366f5ea24dae05760a9ac.zip pfsense-9329ec085be8d176bb9366f5ea24dae05760a9ac.tar.gz | |
Supress errors when opening custom DHCP config file and check if content was successfully retrieved. Prevents PHP from throwing error in case file does not exist.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index b5c5fac..5ab4d3c 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -4236,10 +4236,14 @@ function DHCP_Config_File_Advanced($interface, $wancfg, $wanif) { function DHCP_Config_File_Override($wancfg, $wanif) { - $dhclientconf = file_get_contents($wancfg['adv_dhcp_config_file_override_path']); - $dhclientconf = DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf); + $dhclientconf = @file_get_contents($wancfg['adv_dhcp_config_file_override_path']); - return $dhclientconf; + if ($dhclientconf === false) { + log_error("Error: cannot open {$wancfg['adv_dhcp_config_file_override_path']} in DHCP_Config_File_Override() for reading.\n"); + return ''; + } else { + return DHCP_Config_File_Substitutions($wancfg, $wanif, $dhclientconf); + } } |
