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 2015/07/13 08:51:19 UTC
directory-kerby git commit: [DIRKRB-356]-Config the ENCRYPTION_TYPES
with string instead of string list.
Repository: directory-kerby
Updated Branches:
refs/heads/master 18b655f57 -> 142f4df58
[DIRKRB-356]-Config the ENCRYPTION_TYPES with string instead of string list.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/142f4df5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/142f4df5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/142f4df5
Branch: refs/heads/master
Commit: 142f4df58d106e22ab6fc14eb56ac203fda51b07
Parents: 18b655f
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Jul 13 14:56:51 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Jul 13 14:56:51 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java | 2 +-
.../java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java | 3 +--
.../java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java | 4 +---
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/142f4df5/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
index 0933b56..477dee1 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
@@ -35,7 +35,7 @@ public class KrbConfHelper {
/**
* The regex to split a config value(string) to a list of config value(string list).
*/
- private static final String LIST_SPLITTER = " ";
+ private static final String LIST_SPLITTER = " |,";
public static String getStringUnderSection(Conf conf, SectionConfigKey key) {
Config subConfig = conf.getConfig(key.getSectionName());
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/142f4df5/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
index 5d6e4ee..e9c4dc9 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
@@ -139,8 +139,7 @@ public class KdcConfig extends Conf {
}
public List<EncryptionType> getEncryptionTypes() {
- List<String> eTypes = getList(KdcConfigKey.ENCRYPTION_TYPES);
- return KrbConfHelper.getEncryptionTypes(eTypes);
+ return KrbConfHelper.getEncTypesUnderSection(this, KdcConfigKey.ENCRYPTION_TYPES);
}
public boolean isPaEncTimestampRequired() {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/142f4df5/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
index b656d96..a03dcbb 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
@@ -46,9 +46,7 @@ public enum KdcConfigKey implements SectionConfigKey {
PROXIABLE_ALLOWED(true),
RENEWABLE_ALLOWED(true),
VERIFY_BODY_CHECKSUM(true),
- ENCRYPTION_TYPES(
- new String[] {"aes128-cts-hmac-sha1-96", "des3-cbc-sha1-kd"}
- ),
+ ENCRYPTION_TYPES("aes128-cts-hmac-sha1-96 des3-cbc-sha1-kd"),
RESTRICT_ANONYMOUS_TO_TGT(false, "kdcdefaults"),
KDC_MAX_DGRAM_REPLY_SIZE(4096, "kdcdefaults");