From 767456506b04ab6e11cdd74e59195059be508904 Mon Sep 17 00:00:00 2001 From: onefang Date: Sat, 18 Dec 2021 00:07:00 +1000 Subject: Oops, use .value for the actual, you know, value. --- apt-panopticon-report-email-web.lua | 10 +++++----- apt-panopticon.lua | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua index 73e0338..dd8cff6 100755 --- a/apt-panopticon-report-email-web.lua +++ b/apt-panopticon-report-email-web.lua @@ -18,8 +18,8 @@ APT.debians = loadfile("results/debians.lua")() local revDNS = function(hosts, dom, IP) if APT.options.roundRobin.value ~= dom then if nil ~= hosts[APT.options.roundRobin.value] then - if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname] then - if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname][IP] then + if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value] then + if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value][IP] then if APT.html then return "DNS-RR" else @@ -203,8 +203,8 @@ local DNSrrTest = function(hosts, k) if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) and (nil ~= hosts[k].IPs) then APT.allpairs(hosts[k].IPs, function(i, w, k, v) - if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname] then - if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname][i] then + if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value] then + if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value][i] then local log = logCount(APT.options.roundRobin.value, i) if "" ~= log then if "" == dns then dns = " " else dns = dns .. space end @@ -365,7 +365,7 @@ local makeIPlist = function(hosts) for l, w in pairs(hosts[k].IPs) do if type(w) == "table" then -- Don't output the extra DNS-RR entries that are for admin reasons. - if ((APT.options.roundRobin.value == k) and (APT.options.roundRobinCname == l)) or (APT.options.roundRobin.value ~= k) then + if ((APT.options.roundRobin.value == k) and (APT.options.roundRobinCname.value == l)) or (APT.options.roundRobin.value ~= k) then n[l] = {} for i, u in pairs(w) do if (APT.testing("IPv6") and ("AAAA" == u)) or ("A" == u) then diff --git a/apt-panopticon.lua b/apt-panopticon.lua index 1a00fc7..7d08f7d 100755 --- a/apt-panopticon.lua +++ b/apt-panopticon.lua @@ -199,11 +199,11 @@ gatherIPs = function (host) gatherIPs(m.FQDN) IP[host][m.FQDN] = IP[m.FQDN] -- Strip them out so we don't test them twice. - if (nil ~= IP[m.FQDN]) and (nil ~= IP[host][APT.options.roundRobinCname]) then + if (nil ~= IP[m.FQDN]) and (nil ~= IP[host][APT.options.roundRobinCname.value]) then for l, n in pairs(IP[m.FQDN]) do if type(n) == 'table' then for h, p in pairs(n) do - for j, o in pairs(IP[host][APT.options.roundRobinCname]) do + for j, o in pairs(IP[host][APT.options.roundRobinCname.value]) do if h == j then IP[host][m.FQDN][l][h] = nil end end o = 0 @@ -211,7 +211,7 @@ gatherIPs = function (host) if 0 == o then IP[host][m.FQDN][l] = nil end end else - for j, o in pairs(IP[host][APT.options.roundRobinCname]) do + for j, o in pairs(IP[host][APT.options.roundRobinCname.value]) do if l == j then IP[host][m.FQDN][l] = nil end end end -- cgit v1.1