From c8b1d8cc5b7099d6f150ef2e1f1dc7f92cb65c6c Mon Sep 17 00:00:00 2001
From: Jan Koprowski <jan.koprowski@gmail.com>
Date: Sun, 16 Jan 2011 13:43:45 +0100
Subject: [PATCH] Document handling non-openssh but ssh2-compatible public keys
 by gitolite.

---
 doc/ssh-troubleshooting.mkd | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/ssh-troubleshooting.mkd b/doc/ssh-troubleshooting.mkd
index 0fa7169..8dcc6d9 100644
--- a/doc/ssh-troubleshooting.mkd
+++ b/doc/ssh-troubleshooting.mkd
@@ -8,6 +8,7 @@ In this document:
       * <a href="#_sidebar_why_two_keys_on_client_for_the_admin">(sidebar) why two keys on client for the admin</a>
       * <a href="#_bypassing_gitolite_without_intending_to">bypassing gitolite without intending to</a>
       * <a href="#_basic_ssh_troubleshooting_for_the_admin">basic ssh troubleshooting for the admin</a>
+  * <a href="#_problems_with_using_non_openssh_public_keys">problems with using non-openssh public keys</a>
   * <a href="#_windows_issues">windows issues</a>
   * <a href="#_details">details</a>
       * <a href="#_files_on_the_server">files on the server</a>
@@ -320,6 +321,21 @@ from scratch:
 
 That's a long sequence but it should work.
 
+<a name="_problems_with_using_non_openssh_public_keys"></a>
+
+### problems with using non-openssh public keys
+
+Gitolite accepts public keys only in openssh format.  Trying to use an "ssh2"
+key (used by proprietary SSH software) results in:
+
+    WARNING: a pubkey file can only have one line (key); ignoring YourName.pub
+
+To convert ssh2-compatible keys to openssh run:
+
+    ssh-keygen -i -f /tmp/ssh2/YourName.pub > /tmp/openssh/YourName.pub
+
+then use the resulting pubkey as you normally would in gitolite.
+
 <a name="_windows_issues"></a>
 
 ### windows issues