In the current implementation, target site for exporting a publickey

must run OpenSSH's sshd.

2 files changed, 5 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java
index 9c13c0222..63a4c8442 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java
@@ -801,6 +801,10 @@ public class CVSSSH2PreferencePage extends PreferencePage
       CVSRepositoryLocation crl=CVSRepositoryLocation.fromString(location);
       IProgressMonitor pm=new org.eclipse.core.runtime.NullProgressMonitor();
       Session session=JSchSession.getSession(crl, user, "", host, port, pm);
+      if(session.getServerVersion().indexOf("OpenSSH")==-1){
+      	setErrorMessage(Policy.bind("CVSSSH2PreferencePage.110"));
+    	return;
+      }
       Channel channel=session.openChannel("sftp");
       channel.connect();
       ChannelSftp c=(ChannelSftp)channel;
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties
index 3467d16f1..ae2632d67 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties
@@ -70,6 +70,7 @@ CVSSSH2PreferencePage.106=Export ssh key to remote server via sftp.
 CVSSSH2PreferencePage.107=Specify a target site(in user@host[:port] format) where your public key should be installed.\nYour key will be stored in user@host[:port]:~/.ssh/authorized_keys
 CVSSSH2PreferencePage.108=\ is not valid site.
 CVSSSH2PreferencePage.109=Your public key has been successfully installed to 
+CVSSSH2PreferencePage.110=Remote sshd is not from OpenSSH.
 CVSSSH2ServerConnection.3=session is down
 CVSSSH2PreferencePage.info=Information
 CVSSSH2PreferencePage.warning=Warning