diff options
| author | jim-p <jimp@pfsense.org> | 2011-07-12 19:57:42 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-07-12 19:57:42 -0400 |
| commit | 8b6313a4d3eb1895b6c855436a50606cc7691ad4 (patch) | |
| tree | 97784c2235366f00f42961dd4557e82fadf1ce8c /etc/rc.filter_synchronize | |
| parent | 13b9dba9aae25edf62d6cd58c7446329b0dd913c (diff) | |
| parent | fd3e19f3bf9499b944263c0acaeaa6446260f197 (diff) | |
| download | pfsense-8b6313a4d3eb1895b6c855436a50606cc7691ad4.zip pfsense-8b6313a4d3eb1895b6c855436a50606cc7691ad4.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
etc/inc/easyrule.inc
etc/inc/filter.inc
etc/inc/interfaces.inc
etc/inc/services.inc
etc/inc/xmlrpc_client.inc
usr/local/www/fbegin.inc
usr/local/www/services_dhcp.php
Diffstat (limited to 'etc/rc.filter_synchronize')
| -rwxr-xr-x | etc/rc.filter_synchronize | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 6e17737..c64acd4 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -272,7 +272,7 @@ global $g; if (file_exists("{$g['varrun_path']}/booting") || $g['booting']) return; -if (is_array($config['installedpackages']['carpsettings']['config'])) { +if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])) { update_filter_reload_status("Building CARP sync information"); foreach($config['installedpackages']['carpsettings']['config'] as $carp) { if (empty($carp['synchronizetoip'])) { |
