diff options
author | joe <joe@jerkface.net> | 2014-04-21 01:28:07 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2014-04-21 01:28:07 -0400 |
commit | 987472cadc9823d8e76f13dbcf4358b5cf57f6fa (patch) | |
tree | 5c99165d1f9b2202395b063d8c0c9ccc57fcbf30 /kiki.hs | |
parent | ba3249708c52d0c5cf85ed5eb13dd7191b6b990b (diff) |
Don't write hosts files that are not marked mutable
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1136,6 +1136,8 @@ main = do | |||
1136 | wallets | 1136 | wallets |
1137 | rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd))) | 1137 | rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd))) |
1138 | keyrings_ | 1138 | keyrings_ |
1139 | hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs | ||
1140 | where decorate fname = (ArgFile fname, (MutableRef Nothing, Hosts)) | ||
1139 | importStyle = maybe (\_ _ -> subkeysOnly) | 1141 | importStyle = maybe (\_ _ -> subkeysOnly) |
1140 | (\f rt kd -> f rt kd >> importPublic) | 1142 | (\f rt kd -> f rt kd >> importPublic) |
1141 | $ mplus import_f importifauth_f | 1143 | $ mplus import_f importifauth_f |
@@ -1152,6 +1154,7 @@ main = do | |||
1152 | ++ rings | 1154 | ++ rings |
1153 | ++ pems | 1155 | ++ pems |
1154 | ++ walts | 1156 | ++ walts |
1157 | ++ hosts | ||
1155 | , kImports = Map.fromList $ | 1158 | , kImports = Map.fromList $ |
1156 | [ ( HomePub, importStyle ) ] | 1159 | [ ( HomePub, importStyle ) ] |
1157 | , kManip = noManip | 1160 | , kManip = noManip |