1 files changed, 11 insertions, 6 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index a134680..25c98e2 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -41,6 +41,10 @@ import CommandLine
 import KeyRing
 import DotLock
 
+withAgent :: [PassphraseSpec] -> [PassphraseSpec]
+withAgent [] = [PassphraseAgent]
+withAgent ps = ps
+
 ciphername Unencrypted = "-"
 ciphername TripleDES   = "3des"
 ciphername (SymmetricAlgorithm w8) = "cipher-"++show w8
@@ -87,8 +91,8 @@ minimalOp cap = op
             [ ( HomeSec, streaminfo { access = Sec })
             , ( HomePub, streaminfo { access = Pub })
             ]
-        , opPassphrases = do pfile <- maybeToList (cap_passfd cap)
-                             return $ PassphraseSpec Nothing Nothing pfile
+        , opPassphrases = withAgent $ do pfile <- maybeToList (cap_passfd cap)
+                                         return $ PassphraseSpec Nothing Nothing pfile
         , opTransforms = []
         , opHome = cap_homespec cap
         }
@@ -155,6 +159,7 @@ importAndRefresh root cmn = do
             ctx = InputFileContext secring pubring
             passwordop = KeyRingOperation
                             { opFiles = Map.empty
+                            -- TODO: ask agent for new passphrase
                             , opPassphrases = do pfd <- maybeToList passfd
                                                  return $ PassphraseSpec Nothing Nothing pfd
                             , opHome = homespec
@@ -233,16 +238,16 @@ importAndRefresh root cmn = do
                 , ( ArgFile sshcpath, (peminfo 2048 "ssh-client") )
                 , ( ArgFile sshspath, (peminfo 2048 "ssh-server") )
                 ]
-             , opPassphrases = pwds ++ do pfd <- maybeToList passfd
-                                          return $ PassphraseSpec Nothing Nothing pfd
+             , opPassphrases = withAgent $ pwds ++ do pfd <- maybeToList passfd
+                                                      return $ PassphraseSpec Nothing Nothing pfd
              , opHome = homespec
              , opTransforms = []
              }
         -- doNothing = return ()
         nop = KeyRingOperation
             { opFiles = Map.empty
-            , opPassphrases = do pfd <- maybeToList passfd
-                                 return $ PassphraseSpec Nothing Nothing pfd
+            , opPassphrases = withAgent $ do pfd <- maybeToList passfd
+                                             return $ PassphraseSpec Nothing Nothing pfd
             , opHome=homespec, opTransforms = []
             }
     -- if bUnprivileged then doNothing else mkdirFor torpath