summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-10-12 17:22:16 -0400
committerAndrew Cady <d@jerkface.net>2019-10-12 17:22:16 -0400
commit41d34947ca8c26c4521058e55d389570b255582a (patch)
treed5fc389cc73461dae644ed14c00b28451a77a16c
parent95ccde94127220c6f4d350985aeca71ab89c2ec1 (diff)
try to make understandable
-rw-r--r--lib/KeyRing/BuildKeyDB.hs4
1 files changed, 1 insertions, 3 deletions
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
919 -- when we should be removing origins from the locations 919 -- when we should be removing origins from the locations
920 -- field of the sig's MappedPacket records. 920 -- field of the sig's MappedPacket records.
921 -- Call getHostnames and compare to see if no-op. 921 -- Call getHostnames and compare to see if no-op.
922 if pred || pred2 922 if (addr `elem` outgoing_names) || (gotNonOnions == namesWithoutGotOnions)
923 then {- trace (unlines [ "setHostnames NO-OP: gpg: "++show (map Char8.unpack onions, map Char8.unpack names0) 923 then {- trace (unlines [ "setHostnames NO-OP: gpg: "++show (map Char8.unpack onions, map Char8.unpack names0)
924 , " file: "++show (map Char8.unpack names) 924 , " file: "++show (map Char8.unpack names)
925 , " pred: "++show (pred addr)]) -} 925 , " pred: "++show (pred addr)]) -}
@@ -935,11 +935,9 @@ setHostnames (IPsToWriteToHostsFile outgoing_names) hosts kd@(KeyData topmp tops
935 -} 935 -}
936 return $ KeyData topmp topsigs uids1 subs 936 return $ KeyData topmp topsigs uids1 subs
937 where 937 where
938 pred = addr `elem` outgoing_names
939 addr = fingerdress $ packet topmp 938 addr = fingerdress $ packet topmp
940 names :: [Char8.ByteString] 939 names :: [Char8.ByteString]
941 names = Hosts.namesForAddress addr hosts 940 names = Hosts.namesForAddress addr hosts
942 pred2 = gotNonOnions == namesWithoutGotOnions
943 941
944 Hostnames _ gotOnions gotNonOnions cryptonomic = getHostnames kd 942 Hostnames _ gotOnions gotNonOnions cryptonomic = getHostnames kd
945 943