mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fhem.pl: SecurityCheck call reordering

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15680 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2017-12-24 08:05:59 +00:00
parent 604c3b7cef
commit 052e01a261
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/fhem.pl
View File

@@ -558,16 +558,6 @@ if(configDBUsed()) {
}
}
if($cfgRet) {
$attr{global}{autosave} = 0;
$attr{global}{motd} = "$cfgErrMsg\n$cfgRet\nAutosave deactivated";
Log 1, $cfgRet;
} elsif($attr{global}{motd} && $attr{global}{motd} =~ m/^$cfgErrMsg/) {
$attr{global}{motd} = "";
}
my $pfn = $attr{global}{pidfilename};
if($pfn) {
die "$pfn: $!\n" if(!open(PID, ">$pfn"));
@@ -590,7 +580,19 @@ foreach my $d (keys %defs) {
}
}
SecurityCheck();
if($cfgRet) {
$attr{global}{autosave} = 0;
$attr{global}{motd} = "$cfgErrMsg\n$cfgRet\nAutosave deactivated";
Log 1, $cfgRet;
} elsif($attr{global}{motd} && $attr{global}{motd} =~ m/^$cfgErrMsg/) {
$attr{global}{motd} = "";
} else {
SecurityCheck();
}
$fhem_started = time;
DoTrigger("global", "INITIALIZED", 1);