From f626d73442d18096b38b44cd6bd36f3ffa1c3200 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Feb 2014 16:45:39 -0400 Subject: [PATCH] work around what is likely a bug in a new version of ssh This avoids running into it for new setups, but does not transition old setups. Just a quick fix; I hope to get ssh fixed. --- Assistant/Ssh.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 82da9e33aa..fdb56f08b1 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -315,10 +315,14 @@ setSshConfig sshdata config = do - to allow unMangleSshHostName to work. Any unusual characters in the - username or directory are url encoded, except using "." rather than "%" - (the latter has special meaning to ssh). + - + - The mangled hostname is lower-cased because openssh 6.5p1 does not work + - if ssh config Host lines contain any upper-case. -} mangleSshHostName :: SshData -> String -mangleSshHostName sshdata = "git-annex-" ++ T.unpack (sshHostName sshdata) - ++ "-" ++ escape extra +mangleSshHostName sshdata = map toLower $ + "git-annex-" ++ T.unpack (sshHostName sshdata) + ++ "-" ++ escape extra where extra = intercalate "_" $ map T.unpack $ catMaybes [ sshUserName sshdata