streamlined variable expansion

side effects removed

1 files changed, 2 insertions, 9 deletions

diff --git a/awall/policy.lua b/awall/policy.lua
index f966895..22544a6 100644
--- a/awall/policy.lua
+++ b/awall/policy.lua
@@ -60,17 +60,10 @@ end
 function PolicyConfig:expand()
 
    local function expand(obj)
-      for k, v in pairs(obj) do
-	 if type(v) == 'table' then expand(v)
-	 else obj[k] = self:eval(v) end
-      end
-   end
-   
-   for k, v in pairs(self.data) do
-      if k ~= 'variable' then expand(v) end
+      return type(obj) == 'table' and util.map(obj, expand) or self:eval(obj)
    end
 
-   return self.data
+   return expand(self.data)
 end