diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-11-22 14:18:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-22 14:18:34 -0400 |
| commit | 8166ebdb34c513af648072e03682c8c503f57bdd (patch) | |
| tree | 8c9ee4b158066611ebdd90ffe814046bf46403ca /CmdLine | |
| parent | fb500b7482279be5a1c7f0104331d6c41ed7b649 (diff) | |
unified AuthToken type between webapp and tor
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/GitRemoteTorAnnex.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CmdLine/GitRemoteTorAnnex.hs b/CmdLine/GitRemoteTorAnnex.hs index f3c3a81ae..3282cc081 100644 --- a/CmdLine/GitRemoteTorAnnex.hs +++ b/CmdLine/GitRemoteTorAnnex.hs @@ -14,6 +14,7 @@ import Remote.Helper.P2P import Remote.Helper.P2P.IO import Remote.Helper.Tor import Utility.Tor +import Utility.AuthToken import Annex.UUID run :: [String] -> IO () @@ -53,7 +54,7 @@ connectService address port service = do state <- Annex.new =<< Git.CurrentRepo.get Annex.eval state $ do authtoken <- fromMaybe nullAuthToken - <$> getTorAuthToken address + <$> getTorAuthTokenFor address myuuid <- getUUID g <- Annex.gitRepo h <- liftIO $ torHandle =<< connectHiddenService address port |