diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-05-11 17:33:18 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-05-11 17:36:03 -0400 |
commit | a087841ae775a14197c1550488f54b5761f4700b (patch) | |
tree | 93b0c8f09107395bd58f9dc7210b8ee0817cf20d /Annex/LockFile.hs | |
parent | b09ac870e1dd2bc924c2ab4cd1d2280024a8a80a (diff) |
Ssh password prompting improved when using -J
When ssh connection caching is enabled (and when GIT_ANNEX_USE_GIT_SSH is
not set), only one ssh password prompt will be made per host, and only one
ssh password prompt will be made at a time.
This also fixes a race in prepSocket's stale ssh connection stopping
when run with -J. It was possible for one thread to start a cached ssh
connection, and another thread to immediately stop it, resulting in excess
connections being made.
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Annex/LockFile.hs')
-rw-r--r-- | Annex/LockFile.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Annex/LockFile.hs b/Annex/LockFile.hs index cb1d232b9..1f35444f5 100644 --- a/Annex/LockFile.hs +++ b/Annex/LockFile.hs @@ -11,6 +11,7 @@ module Annex.LockFile ( lockFileCached, unlockFile, getLockCache, + fromLockCache, withExclusiveLock, tryExclusiveLock, ) where |