From: Tobias Ulmer <tu@emlix.com>
Date: Wed, 7 Sep 2016 15:30:17 +0000 (+0200)
Subject: e2lib: verify_global_config(): always check for existence of servers table
X-Git-Tag: e2factory-2.3.15rc1~103
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=346c2bd3a1ccd7e27a42a9aac40cf26bf64e53d0;p=e2factory.git

e2lib: verify_global_config(): always check for existence of servers table

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index b347459..e06c799 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -881,6 +881,11 @@ local function verify_global_config(config)
         return false, re
     end
 
+    rc, re = assert_type(config.servers, "config.servers", "table")
+    if not rc then
+        return false, re
+    end
+
     return true
 end
 
diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua
index 9327666..7499cd7 100644
--- a/global/e2-install-e2.lua
+++ b/global/e2-install-e2.lua
@@ -69,11 +69,6 @@ local function e2_install_e2(arg)
         error(re)
     end
 
-    local servers = config.servers
-    if not servers then
-        error(err.new("no servers configured in global config"))
-    end
-
     local scache, re = cache.setup_cache(config)
     if not scache then
         error(e:cat(re))