From 41d34947ca8c26c4521058e55d389570b255582a Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 12 Oct 2019 17:22:16 -0400 Subject: try to make understandable --- lib/KeyRing/BuildKeyDB.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/KeyRing/BuildKeyDB.hs') diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs index 90f7292..3fe1d17 100644 --- a/lib/KeyRing/BuildKeyDB.hs +++ b/lib/KeyRing/BuildKeyDB.hs @@ -919,7 +919,7 @@ setHostnames (IPsToWriteToHostsFile outgoing_names) hosts kd@(KeyData topmp tops -- when we should be removing origins from the locations -- field of the sig's MappedPacket records. -- Call getHostnames and compare to see if no-op. - if pred || pred2 + if (addr `elem` outgoing_names) || (gotNonOnions == namesWithoutGotOnions) then {- trace (unlines [ "setHostnames NO-OP: gpg: "++show (map Char8.unpack onions, map Char8.unpack names0) , " file: "++show (map Char8.unpack names) , " pred: "++show (pred addr)]) -} @@ -935,11 +935,9 @@ setHostnames (IPsToWriteToHostsFile outgoing_names) hosts kd@(KeyData topmp tops -} return $ KeyData topmp topsigs uids1 subs where - pred = addr `elem` outgoing_names addr = fingerdress $ packet topmp names :: [Char8.ByteString] names = Hosts.namesForAddress addr hosts - pred2 = gotNonOnions == namesWithoutGotOnions Hostnames _ gotOnions gotNonOnions cryptonomic = getHostnames kd -- cgit v1.2.3