diff options
Diffstat (limited to 'lib/KeyRing/BuildKeyDB.hs')
-rw-r--r-- | lib/KeyRing/BuildKeyDB.hs | 7 |
1 files changed, 4 insertions, 3 deletions
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 | |||
121 | import ByteStringUtil | 121 | import ByteStringUtil |
122 | import Text.XXD | 122 | import Text.XXD |
123 | 123 | ||
124 | newtype IPsToWriteToHostsFile = IPsToWriteToHostsFile [SockAddr] | ||
124 | -- | buildKeyDB | 125 | -- | buildKeyDB |
125 | -- | 126 | -- |
126 | -- merge all keyrings, PEM files, and wallets into process memory. | 127 | -- merge all keyrings, PEM files, and wallets into process memory. |
@@ -133,7 +134,7 @@ buildKeyDB :: InputFileContext -> Maybe String -> KeyRingOperation | |||
133 | {- hostdbs -}[Hosts.Hosts], | 134 | {- hostdbs -}[Hosts.Hosts], |
134 | {- u1 -}Hosts.Hosts, | 135 | {- u1 -}Hosts.Hosts, |
135 | {- gpgnames -}[Hostnames], | 136 | {- gpgnames -}[Hostnames], |
136 | {- outgoing_names -}[SockAddr]) | 137 | {- outgoing_names -}IPsToWriteToHostsFile) |
137 | ,{- accs -} Map.Map InputFile Access | 138 | ,{- accs -} Map.Map InputFile Access |
138 | ,{- transcode -} PacketTranscoder | 139 | ,{- transcode -} PacketTranscoder |
139 | ,{- unspilled -} Map.Map InputFile Message | 140 | ,{- unspilled -} Map.Map InputFile Message |
@@ -565,7 +566,7 @@ mergeHostFiles :: KeyRingOperation -> KeyDB -> InputFileContext | |||
565 | , [Hosts.Hosts] | 566 | , [Hosts.Hosts] |
566 | , Hosts.Hosts | 567 | , Hosts.Hosts |
567 | , [Hostnames] | 568 | , [Hostnames] |
568 | , [SockAddr])) | 569 | , IPsToWriteToHostsFile)) |
569 | , [(FilePath,KikiReportAction)])) | 570 | , [(FilePath,KikiReportAction)])) |
570 | mergeHostFiles krd db ctx = do | 571 | mergeHostFiles krd db ctx = do |
571 | let hns = files ishosts | 572 | let hns = files ishosts |
@@ -619,7 +620,7 @@ mergeHostFiles krd db ctx = do | |||
619 | -- forM use_db | 620 | -- forM use_db |
620 | db' <- Traversable.mapM (setHostnames outgoing_names u1) db | 621 | db' <- Traversable.mapM (setHostnames outgoing_names u1) db |
621 | 622 | ||
622 | return $ KikiSuccess ((db',(hostdbs0,hostdbs,u1,gpgnames,outgoing_names)),[]) | 623 | return $ KikiSuccess ((db',(hostdbs0,hostdbs,u1,gpgnames,IPsToWriteToHostsFile outgoing_names)),[]) |
623 | 624 | ||
624 | readInputFileL :: InputFileContext -> InputFile -> IO L.ByteString | 625 | readInputFileL :: InputFileContext -> InputFile -> IO L.ByteString |
625 | readInputFileL ctx (Pipe fd _) = fdToHandle fd >>= L.hGetContents | 626 | readInputFileL ctx (Pipe fd _) = fdToHandle fd >>= L.hGetContents |