From fcb408d37edee7139876c5494d7007fad56779b2 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sun, 24 Dec 2017 08:05:59 +0000
Subject: [PATCH] fhem.pl: SecurityCheck call reordering

git-svn-id: https://svn.fhem.de/fhem/trunk@15680 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/fhem.pl | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index da3ab7223..6c29de333 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -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);