diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-15 15:31:00 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-15 15:31:00 -0400 |
| commit | 3df8786bfd712c2d553b690f75680f1a12129a60 (patch) | |
| tree | 609082a929128f41d895fe2ef50aed783bc5c00e /etc | |
| parent | d56f17d1ccf9d0150c9c178be60620b64b0ffa1a (diff) | |
| parent | 62905808cbdf86088a637da92f7cb2946e28d527 (diff) | |
| download | pfsense-3df8786bfd712c2d553b690f75680f1a12129a60.zip pfsense-3df8786bfd712c2d553b690f75680f1a12129a60.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 8 | ||||
| -rwxr-xr-x | etc/rc.filter_synchronize | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index cd419ff..e54413c 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1241,8 +1241,12 @@ function captiveportal_write_db($cpdb, $locked = false, $remove = false) { if (is_array($remove)) { if (!empty($remove)) { $cpdb = captiveportal_read_db(true); - foreach ($remove as $key) - unset($cpdb[$key]); + foreach ($remove as $key) { + if (is_array($key)) + log_error("Captive portal Array passed as unset index: " . print_r($key, true)); + else + unset($cpdb[$key]); + } } else return; //This makes sure no record removal calls } diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 8c89f81..6e17737 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -216,8 +216,12 @@ function carp_sync_xml($url, $username, $password, $sections, $port = 80, $metho $xml[$section] = backup_vip_config_section(); break; case 'user': + $xml['system'][$section] = $config_copy['system'][$section]; + $xml['system']['nextuid'] = $config_copy['system']['nextuid']; + break; case 'group': $xml['system'][$section] = $config_copy['system'][$section]; + $xml['system']['nextgid'] = $config_copy['system']['nextgid']; break; default: $xml[$section] = $config_copy[$section]; @@ -369,8 +373,8 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) { $sections[] = 'crl'; } if ($carp['synchronizeusers'] != "") { - $mergesections[] = 'user'; - $mergesections[] = 'group'; + $sections[] = 'user'; + $sections[] = 'group'; } if ($carp['synchronizednsforwarder'] != "" and is_array($config['dnsmasq'])) $sections[] = 'dnsmasq'; @@ -393,8 +397,6 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) { update_filter_reload_status("Signaling CARP reload signal..."); carp_sync_xml($synchronizetoip, $username, $carp['password'], $sections, $port); - if (is_array($mergesections)) - carp_sync_xml($synchronizetoip, $username, $carp['password'], $mergesections, $port, 'pfsense.restore_config_section'); $cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port); $params = array( XML_RPC_encode($carp['password']) |
