[karaf] branch karaf-4.2.x updated: Fixing an issue with SSH public key file

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 25365d4  Fixing an issue with SSH public key file
     new 821ec49  Merge pull request #912 from coheigea/hostkeypub
25365d4 is described below

commit 25365d47a369618b1b8e6ccd8aba283dc165daa7
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed Aug 21 14:22:18 2019 +0100

    Fixing an issue with SSH public key file
---
 shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java | 2 +-
 shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java 
b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
index ea7a6a4..6c633e4 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
@@ -150,7 +150,7 @@ public class Activator extends BaseActivator implements 
ManagedService {
         Class<?>[] roleClasses      = getClassesArray("sshRoleTypes", 
"org.apache.karaf.jaas.boot.principal.RolePrincipal");
         String sshRole              = getString("sshRole", null);
         String privateHostKey       = getString("hostKey", 
System.getProperty("karaf.etc") + "/host.key");
-        String publicHostKey        = getString("hostKeyPublic", 
System.getProperty("karaf.etc") + "/host.key.pub");
+        String publicHostKey        = getString("hostKeyPub", 
System.getProperty("karaf.etc") + "/host.key.pub");
         String[] authMethods        = getStringArray("authMethods", 
"keyboard-interactive,password,publickey");
         int keySize                 = getInt("keySize", 2048);
         String algorithm            = getString("algorithm", "RSA");
diff --git a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml 
b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
index e52eeb1..ae2e652 100644
--- a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -23,7 +23,7 @@
         <AD id="sshHost" type="String" default="0.0.0.0" name="%sshHost.name" 
description="%sshHost.description"/>
         <AD id="sshRealm" type="String" default="karaf" name="%sshRealm.name" 
description="%sshRealm.description"/>
         <AD id="hostKey" type="String" default="${karaf.etc}/host.key" 
name="%hostKey.name" description="%hostKey.description"/>
-        <AD id="hostKeyPublic" type="String" 
default="${karaf.etc}/host.key.pub" name="%hostKeyPublic.name" 
description="%hostKeyPublic.description"/>
+        <AD id="hostKeyPub" type="String" default="${karaf.etc}/host.key.pub" 
name="%hostKeyPub.name" description="%hostKeyPub.description"/>
         <AD id="keySize" type="Integer" default="2048" name="%keySize.name" 
description="%keySize.description"/>
         <AD id="algorithm" type="String" default="RSA" name="%algorithm.name" 
description="%algorithm.description"/>
     </OCD>