Added 'dns' type to low-level "merge" command.

1 files changed, 6 insertions, 5 deletions

diff --git a/kiki.hs b/kiki.hs
index c5572c6..2fc960d 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1243,7 +1243,7 @@ kiki "merge" [] = do
     putStr . unlines $
         [ "kiki merge [ --passphrase-fd=FD ... ]"
         , "           ( --home[=HOMEDIR]"
-        , "           | --type=(keyring|pem|wallet|hosts)"
+        , "           | --type=(keyring|pem|wallet|hosts|dns)"
         , "           | --access=[auto|secret|public]"
         , "           | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]"
         , "           | --create=CMD"
@@ -1359,10 +1359,11 @@ kiki "merge" args = do
             Left ("create",Just cmd) ->
                 ( flow { initializer = if null cmd then Nothing else Just cmd }
                 , op )
-            Left ("type",Just "keyring") -> ( flow { typ = KeyRingFile }, op )
-            Left ("type",Just "pem"    ) -> ( flow { typ = PEMFile     }, op )
-            Left ("type",Just "wallet" ) -> ( flow { typ = WalletFile  }, op )
-            Left ("type",Just "hosts"  ) -> ( flow { typ = Hosts       }, op )
+            Left ("type",Just "keyring") -> ( flow { typ = KeyRingFile     } , op )
+            Left ("type",Just "pem"    ) -> ( flow { typ = PEMFile         } , op )
+            Left ("type",Just "wallet" ) -> ( flow { typ = WalletFile      } , op )
+            Left ("type",Just "hosts"  ) -> ( flow { typ = Hosts           } , op )
+            Left ("type",Just "dns"  )   -> ( flow { typ = DNSPresentation } , op )
             Left ("access",Just "public") -> ( flow { access = Pub }, op )
             Left ("access",Just "secret") -> ( flow { access = Sec }, op )
             Left ("access",Just "auto")   -> ( flow { access = AutoAccess }, op )