mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fsync after fclose here, clean up some white space while here.

Browse Source 
Conflicts:
	etc/inc/config.lib.inc
This commit is contained in:
Chris Buechler 2015-07-10 18:12:09 -05:00
parent d7b97ca34c
commit 8a811010a4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/inc/config.lib.inc
View File

@ -81,6 +81,7 @@ function encrypted_configxml() {
exec("/bin/mv {$g['conf_path']}/config.xml.tmp {$g['conf_path']}/config.xml");
echo "\n" . gettext("Config.xml unlocked.") . "\n";
fclose($fp);
pfSense_fsync("{$g['conf_path']}/config.xml");
} else {
echo "\n" . gettext("Invalid password entered. Please try again.") . "\n";
}
@ -187,12 +188,15 @@ function generate_config_cache($config) {
$configcache = fopen($g['tmp_path'] . '/config.cache', "w");
fwrite($configcache, serialize($config));
fclose($configcache);
pfSense_fsync($configcache);
unset($configcache);
/* Used for config.extra.xml */
if (file_exists($g['tmp_path'] . '/config.extra.cache') && $config_extra) {
$configcacheextra = fopen($g['tmp_path'] . '/config.extra.cache', "w");
fwrite($configcacheextra, serialize($config_extra));
fclose($configcacheextra);
pfSense_fsync($configcacheextra);
unset($configcacheextra);
}
}
@ -495,7 +499,7 @@ function safe_write_file($file, $content, $force_binary) {
}
// Sync file before returning
return pfSense_fsync(dirname($file));
return pfSense_fsync($file);
}
/****f* config/write_config
@ -830,6 +834,7 @@ function cleanup_backupcache($lock = false) {
$bakout = fopen($g['cf_conf_path'] . '/backup/backup.cache', "w");
fwrite($bakout, serialize($tocache));
fclose($bakout);
pfSense_fsync("{$g['cf_conf_path']}/backup/backup.cache");
conf_mount_ro();
if (!$lock) {
@ -866,12 +871,12 @@ function backup_config() {
/* Create backup directory if needed */
safe_mkdir("{$g['cf_conf_path']}/backup");
if ($config['revision']['time'] == "") {
$baktime = 0;
} else {
$baktime = $config['revision']['time'];
}
if ($config['revision']['description'] == "") {
$bakdesc = "Unknown";
} else {
@ -881,6 +886,7 @@ function backup_config() {
$bakver = ($config['version'] == "") ? "?" : $config['version'];
$bakfilename = $g['cf_conf_path'] . '/backup/config-' . $baktime . '.xml';
copy($g['cf_conf_path'] . '/config.xml', $bakfilename);
if (file_exists($g['cf_conf_path'] . '/backup/backup.cache')) {
$backupcache = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache'));
} else {
@ -890,6 +896,7 @@ function backup_config() {
$bakout = fopen($g['cf_conf_path'] . '/backup/backup.cache', "w");
fwrite($bakout, serialize($backupcache));
fclose($bakout);
pfSense_fsync("{$g['cf_conf_path']}/backup/backup.cache");
conf_mount_ro();