You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2018/05/08 03:11:24 UTC
directory-kerby git commit: Fix the MySQLIdentityBackend package name.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk fee2867ba -> 5ca40b243
Fix the MySQLIdentityBackend package name.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5ca40b24
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5ca40b24
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5ca40b24
Branch: refs/heads/trunk
Commit: 5ca40b243af26c6d1652e69e38a1a1e04ac04fbb
Parents: fee2867
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue May 8 11:09:06 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue May 8 11:09:06 2018 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kerby/has/server/HasServer.java | 2 +-
.../java/org/apache/kerby/has/server/web/rest/ConfigApi.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ca40b24/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
index 5937782..7e20fe7 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
@@ -127,7 +127,7 @@ public class HasServer {
throw new HasException("Failed to get backend config. " + e);
}
String backendJar = backendConfig.getString("kdc_identity_backend");
- if (backendJar.equals("org.apache.kerby.has.server.kdc.MySQLIdentityBackend")) {
+ if (backendJar.equals("org.apache.kerby.kerberos.kdc.identitybackend.MySQLIdentityBackend")) {
updateKdcConf();
}
try {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5ca40b24/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
index fdb5cac..73a2a55 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
@@ -144,7 +144,7 @@ public class ConfigApi {
String mysqlConfig = "mysql_driver = " + driver + "\nmysql_url = " + drizzleUrl
+ "\nmysql_user = " + user + "\nmysql_password = " + password;
Map<String, String> values = new HashMap<>();
- values.put("_JAR_", "org.apache.kerby.has.server.kdc.MySQLIdentityBackend");
+ values.put("_JAR_", "org.apache.kerby.kerberos.kdc.identitybackend.MySQLIdentityBackend");
values.put("#_JSON_DIR_\n", "");
values.put("#_MYSQL_", mysqlConfig);
hasServer.updateConfFile("backend.conf", values);
@@ -187,7 +187,7 @@ public class ConfigApi {
try {
BackendConfig backendConfig = KdcUtil.getBackendConfig(hasServer.getConfDir());
String backendJar = backendConfig.getString("kdc_identity_backend");
- if (backendJar.equals("org.apache.kerby.has.server.kdc.MySQLIdentityBackend")) {
+ if (backendJar.equals("org.apache.kerby.kerberos.kdc.identitybackend.MySQLIdentityBackend")) {
hasServer.configMySQLKdc(backendConfig, realm, port, host, hasServer);
} else {
Map<String, String> values = new HashMap<>();
@@ -228,7 +228,7 @@ public class ConfigApi {
BackendConfig backendConfig = KdcUtil.getBackendConfig(hasServer.getConfDir());
String backendJar = backendConfig.getString("kdc_identity_backend");
File conf;
- if (backendJar.equals("org.apache.kerby.has.server.kdc.MySQLIdentityBackend")) {
+ if (backendJar.equals("org.apache.kerby.kerberos.kdc.identitybackend.MySQLIdentityBackend")) {
conf = hasServer.generateKrb5Conf();
} else {
File confDir = hasServer.getConfDir();
@@ -260,7 +260,7 @@ public class ConfigApi {
BackendConfig backendConfig = KdcUtil.getBackendConfig(hasServer.getConfDir());
String backendJar = backendConfig.getString("kdc_identity_backend");
File conf;
- if (backendJar.equals("org.apache.kerby.has.server.kdc.MySQLIdentityBackend")) {
+ if (backendJar.equals("org.apache.kerby.kerberos.kdc.identitybackend.MySQLIdentityBackend")) {
conf = hasServer.generateHasConf();
} else {
File confDir = hasServer.getConfDir();