summaryrefslogtreecommitdiff
path: root/kiki.hs
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-05-04 20:09:19 -0400
committerjoe <joe@jerkface.net>2014-05-04 20:09:19 -0400
commitb845dc5c5ebad65472c43c6037fc32654562bc71 (patch)
treed3e3a62f8d28d16c34353d3fd63b14166815c499 /kiki.hs
parent2f31a27316faf3de5008fcb5f49316e5178827e6 (diff)
removed deprecated argument to KeyRingFile
Diffstat (limited to 'kiki.hs')
-rw-r--r--kiki.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/kiki.hs b/kiki.hs
index a3c0a56..cae8ae8 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -705,7 +705,7 @@ sync bExport bImport bSecret cmdarg args_raw = do
705 , (buildStreamInfo reftyp WalletFile) { access = Sec })) 705 , (buildStreamInfo reftyp WalletFile) { access = Sec }))
706 wallets 706 wallets
707 rings = map (\fname -> ( ArgFile fname 707 rings = map (\fname -> ( ArgFile fname
708 , buildStreamInfo reftyp $ KeyRingFile passfd)) 708 , buildStreamInfo reftyp KeyRingFile ))
709 keyrings_ 709 keyrings_
710 hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs 710 hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs
711 where decorate fname = (ArgFile fname, buildStreamInfo reftyp Hosts) 711 where decorate fname = (ArgFile fname, buildStreamInfo reftyp Hosts)
@@ -726,10 +726,10 @@ sync bExport bImport bSecret cmdarg args_raw = do
726 { opFiles = Map.fromList $ 726 { opFiles = Map.fromList $
727 [ ( HomeSec, buildStreamInfo (if bSecret && bImport then KF_All 727 [ ( HomeSec, buildStreamInfo (if bSecret && bImport then KF_All
728 else KF_None) 728 else KF_None)
729 (KeyRingFile passfd) ) 729 KeyRingFile )
730 , ( HomePub, buildStreamInfo (if bImport then pubfill 730 , ( HomePub, buildStreamInfo (if bImport then pubfill
731 else KF_None) 731 else KF_None)
732 (KeyRingFile Nothing) ) 732 KeyRingFile )
733 ] 733 ]
734 ++ rings 734 ++ rings
735 ++ if bSecret then pems else [] 735 ++ if bSecret then pems else []
@@ -825,7 +825,7 @@ kiki "show" args = do
825 hosts = [] 825 hosts = []
826 walts = [] 826 walts = []
827 streaminfo = StreamInfo { fill = KF_None 827 streaminfo = StreamInfo { fill = KF_None
828 , typ = KeyRingFile passfd 828 , typ = KeyRingFile
829 , spill = KF_All 829 , spill = KF_All
830 , initializer = Nothing 830 , initializer = Nothing
831 , access = AutoAccess 831 , access = AutoAccess