Don't write hosts files that are not marked mutable

2 files changed, 8 insertions, 5 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index c6aa6a4..653a76d 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -760,12 +760,12 @@ writeHostsFiles
          [SockAddr])
      -> IO [(FilePath, KikiReportAction)]
 writeHostsFiles krd secring pubring (hostdbs0,hostdbs,u1,gpgnames,outgoing_names) = do
-    let hns = files ishosts
-        ishosts Hosts = True
-        ishosts _     = False
+    let hns = files isMutableHosts
+        isMutableHosts (MutableRef _,Hosts) = True
+        isMutableHosts _ = False
         files istyp = do
-            (f,(rtyp,ftyp)) <- Map.toList (kFiles krd)
-            guard (istyp ftyp)
+            (f,typ) <- Map.toList (kFiles krd)
+            guard (istyp typ)
             resolveInputFile secring pubring f
 
     -- 3. add hostnames from gpg for addresses not in U
diff --git a/kiki.hs b/kiki.hs
index 60c0b6b..0d87b90 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1136,6 +1136,8 @@ main = do
                     wallets
         rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd)))
                     keyrings_
+        hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs
+                    where decorate fname = (ArgFile fname, (MutableRef Nothing, Hosts))
         importStyle = maybe (\_ _ -> subkeysOnly)
                             (\f rt kd -> f rt kd >> importPublic)
                         $ mplus import_f importifauth_f
@@ -1152,6 +1154,7 @@ main = do
                 ++ rings
                 ++ pems
                 ++ walts
+                ++ hosts
             , kImports = Map.fromList $
                 [ ( HomePub, importStyle ) ]
             , kManip = noManip