1 files changed, 10 insertions, 1 deletions

diff --git a/kiki.hs b/kiki.hs
index b5509f8..7c89882 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1334,6 +1334,14 @@ main = do
                     wallets
         rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd)))
                     keyrings_
+        importStyle = maybe (\_ _ -> subkeysOnly)
+                            (\f rt kd -> f rt kd >> importPublic)
+                        $ mplus import_f importifauth_f
+            where
+                import_f = do Map.lookup "--import" margs
+                              return $ \rt kd -> Just ()
+                importifauth_f = do Map.lookup "--import-if-authentic" margs
+                                    return guardAuthentic
         kikiOp = KeyRingData
             { kFiles = Map.fromList $
                 [ ( HomeSec, (MutableRef Nothing, KeyRingFile passfd)  )
@@ -1342,7 +1350,8 @@ main = do
                 ++ rings
                 ++ pems
                 ++ walts
-            , kImports = Map.empty
+            , kImports = Map.fromList $
+                [ ( HomePub, importStyle ) ]
             , homeSpec = homespec
             }