summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-30 10:49:08 -0400
committerJoey Hess2016-03-30 10:49:08 -0400
commit1c5d113bc77519e71e2c6dc0e75322a4e8a0287d (patch)
tree09a4798fa24cf731ceb0658d6784949471220938
parentd08734bbbebc0211d4203922fb94384497547d3c (diff)
parente9d6c2ce7d15f6e90d4e455db8c9600c62f6a158 (diff)
Merge branch 'master' into typed-os-requirements
-rw-r--r--src/Propellor/Ssh.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Ssh.hs b/src/Propellor/Ssh.hs
index 3e4806ea..a7a9452e 100644
--- a/src/Propellor/Ssh.hs
+++ b/src/Propellor/Ssh.hs
@@ -66,11 +66,11 @@ socketFile home hn = selectSocketFile
md5 = take 9 $ MD5.md5s $ MD5.Str hn
selectSocketFile :: [FilePath] -> FilePath -> FilePath
-selectSocketFile [] fallback = fallback
+selectSocketFile [] d = d
selectSocketFile [f] _ = f
-selectSocketFile (f:fs) fallback
+selectSocketFile (f:fs) d
| valid_unix_socket_path f = f
- | otherwise = selectSocketFile fs fallback
+ | otherwise = selectSocketFile fs d
valid_unix_socket_path :: FilePath -> Bool
valid_unix_socket_path f = length (decodeW8 f) < 100 - reservedbyssh