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

tweak

Browse source
This commit is contained in:
Joey Hess 2012-09-29 16:22:53 -04:00
parent 74a6e8ff60
commit 33fdcd59be
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assistant/WebApp/Configurators/Ssh.hs
View file

@ -64,14 +64,14 @@ sshInputAForm def = SshInput
checkdns t = do checkdns t = do
let h = T.unpack t let h = T.unpack t
r <- catchMaybeIO $ getAddrInfo canonname (Just h) Nothing r <- catchMaybeIO $ getAddrInfo canonname (Just h) Nothing
return $ case filter isJust . map addrCanonName <$> r of return $ case catMaybes . map addrCanonName <$> r of
-- canonicalize input hostname if it had no dot -- canonicalize input hostname if it had no dot
Just ((Just fullname):_) Just (fullname:_)
| '.' `elem` h -> Right t | '.' `elem` h -> Right t
| otherwise -> Right $ T.pack fullname | otherwise -> Right $ T.pack fullname
Just _ -> Right t Just [] -> Right t
Nothing -> Left bad_hostname Nothing -> Left bad_hostname
canonname = Just $ defaultHints { addrFlags = [AI_CANONNAME]} canonname = Just $ defaultHints { addrFlags = [AI_CANONNAME] }
check_username = checkBool (all (`notElem` "/:@ \t") . T.unpack) check_username = checkBool (all (`notElem` "/:@ \t") . T.unpack)
bad_username textField bad_username textField