1 files changed, 9 insertions, 7 deletions

diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index 587d812..3fe1d17 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE DoAndIfThenElse          #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE LambdaCase               #-}
+{-# LANGUAGE NamedFieldPuns           #-}
 {-# LANGUAGE OverloadedStrings        #-}
 {-# LANGUAGE PatternGuards            #-}
 {-# LANGUAGE TupleSections            #-}
@@ -550,10 +551,7 @@ mergeHostFiles krd db ctx = do
     hostdbs0 <- mapM (fmap Hosts.decode . readInputFileL' ctx) hns
 
     let gpgnames = map getHostnames $ keyData db
-        os = do
-            Hostnames addr ns _ _ <- gpgnames
-            n <- ns
-            return (addr,n)
+        os = concat $ allNames' <$> gpgnames
         setOnions hosts = foldl' (flip $ uncurry Hosts.assignName) hosts os
         -- we ensure .onion names are set properly
         hostdbs = map setOnions hostdbs0
@@ -864,6 +862,12 @@ generateSubkey transcode kd' (genparam,StreamInfo { spill = KF_Match tag }) = do
         return $ KikiSuccess (kd,report0)
 generateSubkey _ kd _ = return kd
 
+allNames :: Hostnames -> [Char8.ByteString]
+allNames (Hostnames _ ns os cs) = ns ++ os ++ (maybe [] return cs)
+
+allNames' :: Hostnames -> [(SockAddr, Char8.ByteString)]
+allNames' h@Hostnames{gpgipv6addr} = (gpgipv6addr,) <$> allNames h
+
 data Hostnames = Hostnames {
   gpgipv6addr :: SockAddr,
   verifiedOnionNames :: [L.ByteString],
@@ -915,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)]) -}
@@ -931,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