diff options
| author | jim-p <jimp@netgate.com> | 2018-11-21 16:30:48 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2018-11-21 16:31:23 -0200 |
| commit | ea0dd417099827b00bc8d8823bce86bfa6519daa (patch) | |
| tree | d135a6e28f7c9d3589f16fb6ac6c2f7405c8bc4f /src/etc/inc/services.inc | |
| parent | 6b0ef0456bc8b8f6270dd70b497042104a13d2f7 (diff) | |
| download | pfsense-ea0dd417099827b00bc8d8823bce86bfa6519daa.zip pfsense-ea0dd417099827b00bc8d8823bce86bfa6519daa.tar.gz | |
Fix #9121: Initialize arrays to prevent PHP 7 errors
Diffstat (limited to 'src/etc/inc/services.inc')
| -rw-r--r-- | src/etc/inc/services.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 2b3cefd..e4b70df 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1751,7 +1751,8 @@ function services_dhcrelay_configure() { /* kill any running dhcrelay */ killbypid("{$g['varrun_path']}/dhcrelay.pid"); - $dhcrelaycfg =& $config['dhcrelay']; + init_config_arr(array('dhcrelay')); + $dhcrelaycfg = &$config['dhcrelay']; /* DHCPRelay enabled on any interfaces? */ if (!isset($dhcrelaycfg['enable'])) { @@ -1826,7 +1827,8 @@ function services_dhcrelay6_configure() { /* kill any running dhcrelay */ killbypid("{$g['varrun_path']}/dhcrelay6.pid"); - $dhcrelaycfg =& $config['dhcrelay6']; + init_config_arr(array('dhcrelay6')); + $dhcrelaycfg = &$config['dhcrelay6']; /* DHCPv6 Relay enabled on any interfaces? */ if (!isset($dhcrelaycfg['enable'])) { @@ -2756,7 +2758,7 @@ function configure_cron() { $crontab_contents = file("/etc/crontab", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); for ($i = 0; $i < count($crontab_contents); $i++) { - $cron_item =& $crontab_contents[$i]; + $cron_item = &$crontab_contents[$i]; if (strpos($cron_item, "# pfSense specific crontab entries") !== false) { array_splice($crontab_contents, $i - 1); break; |
