diff options
author | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-04-14 00:59:50 +0000 |
---|---|---|
committer | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-04-14 00:59:50 +0000 |
commit | 742193103df81e2a2328d9890e142b531d7060c6 (patch) | |
tree | 99e27ba3050c9f3d976fe2acc55c8388e7ff9488 | |
parent | 757aa99c0226a8f2d0c3debc9792b6068fe07958 (diff) | |
download | pki-742193103df81e2a2328d9890e142b531d7060c6.tar.gz pki-742193103df81e2a2328d9890e142b531d7060c6.tar.xz pki-742193103df81e2a2328d9890e142b531d7060c6.zip |
Fixed bugzilla bug #476318.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@385 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r-- | pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java | 47 |
1 files changed, 13 insertions, 34 deletions
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java index cc956412e..562dcef9d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java @@ -39,17 +39,15 @@ import netscape.security.x509.*; */ public class UserExtensionDefault extends EnrollExtDefault { + public static final String CONFIG_CRITICAL = "userExtCritical"; public static final String CONFIG_OID = "userExtOID"; public static final String VAL_CRITICAL = "userExtCritical"; public static final String VAL_OID = "userExtOID"; - public static final String VAL_VALUE = "userExtValue"; public UserExtensionDefault() { super(); - addValueName(VAL_CRITICAL); addValueName(VAL_OID); - addValueName(VAL_VALUE); addConfigName(CONFIG_OID); } @@ -58,22 +56,22 @@ public class UserExtensionDefault extends EnrollExtDefault { super.init(profile, config); } + public IDescriptor getConfigDescriptor(Locale locale, String name) { + if (name.equals(CONFIG_OID)) { + return new Descriptor(IDescriptor.STRING, null, + "Comment Here...", + CMS.getUserMessage(locale, "CMS_PROFILE_OID")); + } else { + return null; + } + } + public IDescriptor getValueDescriptor(Locale locale, String name) { - if (name.equals(VAL_CRITICAL)) { - return new Descriptor(IDescriptor.STRING, - IDescriptor.READONLY, - null, - CMS.getUserMessage(locale, "CMS_PROFILE_CRITICAL")); - } else if (name.equals(VAL_OID)) { + if (name.equals(VAL_OID)) { return new Descriptor(IDescriptor.STRING, IDescriptor.READONLY, null, CMS.getUserMessage(locale, "CMS_PROFILE_OID")); - } else if (name.equals(VAL_VALUE)) { - return new Descriptor(IDescriptor.STRING, - IDescriptor.READONLY, - null, - CMS.getUserMessage(locale, "CMS_PROFILE_EXT_VALUE")); } else { return null; } @@ -92,18 +90,7 @@ public class UserExtensionDefault extends EnrollExtDefault { throw new EPropertyException(CMS.getUserMessage( locale, "CMS_INVALID_PROPERTY", name)); } - if (name.equals(VAL_CRITICAL)) { - Extension ext = getExtension(getConfig(CONFIG_OID), info); - - if (ext == null) { - return null; - } - if (ext.isCritical()) { - return "true"; - } else { - return "false"; - } - } else if (name.equals(VAL_OID)) { + if (name.equals(VAL_OID)) { Extension ext = getExtension(getConfig(CONFIG_OID), info); if (ext == null) { @@ -111,14 +98,6 @@ public class UserExtensionDefault extends EnrollExtDefault { return ""; } return ext.getExtensionId().toString(); - } else if (name.equals(VAL_VALUE)) { - Extension ext = getExtension(getConfig(CONFIG_OID), info); - - if (ext == null) { - // do something here - return ""; - } - return toHexString(ext.getExtensionValue()); } else { throw new EPropertyException(CMS.getUserMessage( locale, "CMS_INVALID_PROPERTY", name)); |