From b7b04edcb8f0a4052439ab043b50bacba15b27f4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 22 Nov 2015 14:39:30 -0500
Subject: [PATCH] Prepare 1.7.0 release
---
src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java
index 375aa71..b6d233c 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshKrbAuthenticator.java
@@ -33,10 +33,21 @@
protected final IAuthenticationManager authManager;
protected final boolean stripDomain;
- public SshKrbAuthenticator(IAuthenticationManager authManager, IStoredSettings settings) {
+
+ public SshKrbAuthenticator(IStoredSettings settings, IAuthenticationManager authManager) {
this.authManager = authManager;
+
+ String keytabString = settings.getString(Keys.git.sshKrb5Keytab, "");
+ if(! keytabString.isEmpty()) {
+ setKeytabFile(keytabString);
+ }
+
+ String servicePrincipalName = settings.getString(Keys.git.sshKrb5ServicePrincipalName, "");
+ if(! servicePrincipalName.isEmpty()) {
+ setServicePrincipalName(servicePrincipalName);
+ }
+
this.stripDomain = settings.getBoolean(Keys.git.sshKrb5StripDomain, false);
- log.info("registry {}", authManager);
}
@Override
--
Gitblit v1.9.1