diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-06 10:39:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-06 10:39:51 -0400 |
| commit | 2126a02570bb00eb96e0ed1738898cf6b1024887 (patch) | |
| tree | 75b8db26d2579df648529fea591710272c0d571e | |
| parent | 3540e34025049ed4420810f21cdad6a5adc851c5 (diff) | |
assistant: Allow periods in ssh key comments.
| -rw-r--r-- | Assistant/Ssh.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 01e44f31b..dad0a8415 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -112,7 +112,7 @@ validateSshPubKey pubkey = either error return $ check $ words pubkey (ssh, keytype) = separate (== '-') prefix checkcomment comment - | all (\c -> isAlphaNum c || c == '@' || c == '-' || c == '_') comment = ok + | all (\c -> isAlphaNum c || c == '@' || c == '-' || c == '_' || c == '.') comment = ok | otherwise = err "bad comment in ssh public key" addAuthorizedKeys :: Bool -> FilePath -> SshPubKey -> IO Bool diff --git a/debian/changelog b/debian/changelog index d43bdcff8..39063d991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ git-annex (3.20121128) UNRELEASED; urgency=low explanations. * webapp: Encryption can be disabled when setting up remotes. * assistant: Avoid trying to drop content from remotes that don't have it. + * assistant: Allow periods in ssh key comments. -- Joey Hess <joeyh@debian.org> Wed, 28 Nov 2012 13:31:07 -0400 diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn b/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn index 71402b1b2..371b923cf 100644 --- a/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn +++ b/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn @@ -14,3 +14,5 @@ Remote Machine: 3.20121113, Arch Linux (I installed the version from: https://au Please provide any additional information below. None as yet. Let me know if there are any log files, etc. that I can post. + +> So it was the period in the hostname! [[fixed|done]] --[[Joey]] |