From 8b1d0aed40b4fc3ed5b30aa824a4c2924b788454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 11:11:20 -0400
Subject: [PATCH] Merge branch 'ticket/142' into develop
---
src/main/java/com/gitblit/transport/ssh/NullKeyManager.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index c76728d..fcd3e19 100644
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -15,17 +15,19 @@
*/
package com.gitblit.transport.ssh;
-import java.security.PublicKey;
import java.util.List;
+import com.google.inject.Inject;
+
/**
- * Rejects all SSH key management requests.
+ * Rejects all public key management requests.
*
* @author James Moger
*
*/
-public class NullKeyManager extends IKeyManager {
+public class NullKeyManager extends IPublicKeyManager {
+ @Inject
public NullKeyManager() {
}
@@ -36,6 +38,7 @@
@Override
public NullKeyManager start() {
+ log.info(toString());
return this;
}
@@ -55,17 +58,17 @@
}
@Override
- protected List<PublicKey> getKeysImpl(String username) {
+ protected List<SshKey> getKeysImpl(String username) {
return null;
}
@Override
- public boolean addKey(String username, String data) {
+ public boolean addKey(String username, SshKey key) {
return false;
}
@Override
- public boolean removeKey(String username, String data) {
+ public boolean removeKey(String username, SshKey key) {
return false;
}
--
Gitblit v1.9.1