mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Make .git/annex/ssh.config file work with versions of ssh older than 7.3, which don't support Include.

Browse source 
When used with an older version of ssh, any ServerAliveInterval in
~/.ssh/config will be overridden by .git/annex/ssh.config.

This commit was sponsored by Josh Taylor on Patreon.
This commit is contained in:
Joey Hess 2016-11-07 10:32:57 -04:00
parent 1864128141
commit 7ed96a2405
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/Ssh.hs
View file

@ -56,8 +56,12 @@ sshOptions (host, port) gc opts = go =<< sshCachingInfo (host, port)
-- If it did, a more expensive test would be needed. -- If it did, a more expensive test would be needed.
liftIO $ unlessM (doesFileExist overideconfigfile) $ liftIO $ unlessM (doesFileExist overideconfigfile) $
viaTmp writeFile overideconfigfile $ unlines viaTmp writeFile overideconfigfile $ unlines
-- Make old version of ssh that does
-- not know about Include ignore those
-- entries.
[ "IgnoreUnknown Include"
-- ssh expands "~" -- ssh expands "~"
[ "Include ~/.ssh/config" , "Include ~/.ssh/config"
-- ssh will silently skip the file -- ssh will silently skip the file
-- if it does not exist -- if it does not exist
, "Include /etc/ssh/ssh_config" , "Include /etc/ssh/ssh_config"

4
CHANGELOG
View file

@ -3,6 +3,10 @@ git-annex (6.20161032) UNRELEASED; urgency=medium
* Restarting a crashing git process could result in filename encoding * Restarting a crashing git process could result in filename encoding
issues when not in a unicode locale, as the restarted processes's issues when not in a unicode locale, as the restarted processes's
handles were not read in raw mode. handles were not read in raw mode.
* Make .git/annex/ssh.config file work with versions of ssh older than
7.3, which don't support Include. When used with an older version
of ssh, any ServerAliveInterval in ~/.ssh/config will be overridden
by .git/annex/ssh.config.
-- Joey Hess <id@joeyh.name> Tue, 01 Nov 2016 14:02:06 -0400 -- Joey Hess <id@joeyh.name> Tue, 01 Nov 2016 14:02:06 -0400

16
doc/bugs/git_annex_init_failed_due_to_unsupported_ssh_option.mdwn
View file

@ -49,3 +49,19 @@ I would just like to be sure nothing else is hidden.
> [[fixed|done]] by adding "IgnoreUnknown Include"
> to the top of `.git/annex/ssh_config`. Thus supporting the old ssh
> version without needing to probe for its version number.
>
> IgnoreUnknown itself was added back in ssh 6.4, in 2013, so
> using git-annex with such an old ssh will still not work, but
> such an old ssh probably has security holes anyway. (Debian oldstable has
> such an old version of ssh, but Debian stable has 6.5.)
>
> I decided not to update existing `.git/annex/ssh_config`
> since a) the user may have edited it and b) it would slow down every call
> git-annex makes to ssh and c) as noted this problem makes git-annex mark
> remotes as annex-ignore, and the user will need to manually edit
> .git/config to remove that in order to recover from the problem, so might
> as well remove `.git/annex/ssh_config` too.
> --[[Joey]]