summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-06-25 14:46:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-06-25 14:46:20 -0400
commit077de67a8695da525f79a7a1e58ad9fa535ca8b1 (patch)
tree4d5b2cfcd760f8648dcf5b4320fba73848b75e6b /debian
parent8e7e5684c469652a95d654d7f0f93abd041d9c06 (diff)
webapp: Fix bug when setting up a remote ssh repo repeatedly on the same server.
The ssh setup first runs ssh to the real hostname, to probe if a ssh key is needed. If one is, it generates a mangled hostname that uses a key. This mangled hostname was being used to ssh into the server to set up the key. But if the server already had the key set up, and it was locked down, the setup would fail. This changes it to use the real hostname when sshing in to set up the key, which avoids the problem. Note that it will redundantly set up the key on the ssh server. But it's the same key; the ssh key generation code uses the key if it already exists.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index dcf5e41af..85a356122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ git-annex (4.20130622) UNRELEASED; urgency=low
* bup: Handle /~/ in bup remote paths.
Thanks, Oliver Matthews
* fsck: Ensures that direct mode is used for files when it's enabled.
+ * webapp: Fix bug when setting up a remote ssh repo repeatedly on the same
+ server.
-- Joey Hess <joeyh@debian.org> Fri, 21 Jun 2013 13:16:17 -0400