From e7373bc2114179db99dd53009b11c1c3b96c7d8e Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Mon, 8 Jul 2019 18:01:49 -0400
Subject: use a type for outgoing_names

---
 lib/KeyRing/BuildKeyDB.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/KeyRing')

diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index 6e62e70..a2fdfd2 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -121,6 +121,7 @@ import           GnuPGAgent
 import           ByteStringUtil
 import           Text.XXD
 
+newtype IPsToWriteToHostsFile = IPsToWriteToHostsFile [SockAddr]
 -- | buildKeyDB
 --
 --   merge all keyrings, PEM files, and wallets into process memory.
@@ -133,7 +134,7 @@ buildKeyDB :: InputFileContext -> Maybe String -> KeyRingOperation
                                                       {- hostdbs  -}[Hosts.Hosts],
                                                       {- u1       -}Hosts.Hosts,
                                                       {- gpgnames -}[Hostnames],
-                                                      {- outgoing_names -}[SockAddr])
+                                                      {- outgoing_names -}IPsToWriteToHostsFile)
                                     ,{- accs      -} Map.Map InputFile Access
                                     ,{- transcode -} PacketTranscoder
                                     ,{- unspilled -} Map.Map InputFile Message
@@ -565,7 +566,7 @@ mergeHostFiles :: KeyRingOperation -> KeyDB -> InputFileContext
                  , [Hosts.Hosts]
                  , Hosts.Hosts
                  , [Hostnames]
-                 , [SockAddr]))
+                 , IPsToWriteToHostsFile))
              , [(FilePath,KikiReportAction)]))
 mergeHostFiles krd db ctx = do
     let hns = files ishosts
@@ -619,7 +620,7 @@ mergeHostFiles krd db ctx = do
     -- forM use_db
     db' <- Traversable.mapM (setHostnames outgoing_names u1) db
 
-    return $ KikiSuccess ((db',(hostdbs0,hostdbs,u1,gpgnames,outgoing_names)),[])
+    return $ KikiSuccess ((db',(hostdbs0,hostdbs,u1,gpgnames,IPsToWriteToHostsFile outgoing_names)),[])
 
 readInputFileL :: InputFileContext -> InputFile -> IO L.ByteString
 readInputFileL ctx (Pipe fd _)   = fdToHandle fd >>= L.hGetContents
-- 
cgit v1.2.3