From 60f5dfd7eaa64aa931033c0e5266391ecbbc96fa Mon Sep 17 00:00:00 2001 From: Nicolas Capponi <nicolas.capponi@forgerock.com> Date: Wed, 25 Sep 2013 07:31:13 +0000 Subject: [PATCH] Fix OPENDJ-18 - keystore import failes due to empty PIN Review CR-2353 --- opends/src/messages/messages/extension_zh_CN.properties | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/opends/src/messages/messages/extension_zh_CN.properties b/opends/src/messages/messages/extension_zh_CN.properties index 92bcb3b..bf97213 100644 --- a/opends/src/messages/messages/extension_zh_CN.properties +++ b/opends/src/messages/messages/extension_zh_CN.properties @@ -21,7 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2010 Sun Microsystems, Inc. -# Portions copyright 2012 ForgeRock AS. +# Portions copyright 2012-2013 ForgeRock AS. @@ -79,7 +79,6 @@ SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ_57=\u5728\u5c1d\u8bd5\u4ece\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u8bfb\u53d6\u5bc6\u94a5\u5e93 PIN \u65f6\u51fa\u73b0\u9519\u8bef: %3$s SEVERE_ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY_58=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u5e94\u8be5\u5305\u542b\u8bbf\u95ee\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u6240\u5fc5\u9700\u7684 PIN\uff0c\u4f46\u8be5\u6587\u4ef6\u4e3a\u7a7a SEVERE_ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_60=\u5728\u5c1d\u8bd5\u786e\u5b9a\u914d\u7f6e\u6761\u76ee %s \u4e2d\u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u503c\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s -SEVERE_ERR_FILE_KEYMANAGER_NO_PIN_61=\u914d\u7f6e\u6761\u76ee %s \u6ca1\u6709\u6307\u5b9a\u7528\u4e8e\u786e\u5b9a\u8bbf\u95ee\u57fa\u4e8e\u6587\u4ef6\u7684\u5bc6\u94a5\u7ba1\u7406\u5668\u4e4b\u5185\u5bb9\u6240\u5fc5\u9700\u7684 PIN \u7684\u65b9\u6cd5\u3002\u53ef\u4ee5\u5728 Java \u5c5e\u6027\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-property \u547d\u540d\uff09\u3001\u73af\u5883\u53d8\u91cf\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-environment-variable \u547d\u540d\uff09\uff0c\u6587\u672c\u6587\u4ef6\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-file \u547d\u540d\uff09\u4e2d\u6307\u5b9a PIN\uff0c\u6216\u8005\u76f4\u63a5\u5728\u4f7f\u7528\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u6761\u76ee\u4e2d\u6307\u5b9a SEVERE_ERR_FILE_KEYMANAGER_CANNOT_LOAD_62=\u5728\u5c1d\u8bd5\u4ece\u6587\u4ef6 %s \u52a0\u8f7d\u5bc6\u94a5\u5e93\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef: %s SEVERE_ERR_FILE_KEYMANAGER_INVALID_TYPE_63=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-type \u4e2d\u6307\u5b9a\u7684\u5bc6\u94a5\u5e93\u7c7b\u578b %1$s \u65e0\u6548: %3$s SEVERE_ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET_68=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-pin-property \u4e2d\u6307\u5b9a\u7684 Java \u5c5e\u6027 %1$s \u5e94\u5305\u542b\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u5fc5\u9700\u7684 PIN\uff0c\u4f46\u8be5\u5c5e\u6027\u672a\u8bbe\u7f6e @@ -88,7 +87,6 @@ SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ_75=\u5728\u5c1d\u8bd5\u4ece\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u8bfb\u53d6\u5bc6\u94a5\u5e93 PIN \u65f6\u51fa\u73b0\u9519\u8bef: %3$s SEVERE_ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY_76=\u5728\u914d\u7f6e\u6761\u76ee %2$s \u7684\u5c5e\u6027 ds-cfg-key-store-pin-file \u4e2d\u6307\u5b9a\u7684\u6587\u4ef6 %1$s \u5e94\u8be5\u5305\u542b\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u6240\u5fc5\u9700\u7684 PIN\uff0c\u4f46\u8be5\u6587\u4ef6\u4e3a\u7a7a SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR_79=\u5728\u5c1d\u8bd5\u786e\u5b9a\u914d\u7f6e\u6761\u76ee %s \u4e2d\u7684\u914d\u7f6e\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u503c\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s -SEVERE_ERR_PKCS11_KEYMANAGER_NO_PIN_80=\u914d\u7f6e\u6761\u76ee %s \u6ca1\u6709\u6307\u5b9a\u7528\u4e8e\u786e\u5b9a\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u4e4b\u5185\u5bb9\u6240\u5fc5\u9700\u7684 PIN \u7684\u65b9\u6cd5\u3002\u53ef\u4ee5\u5728 Java \u5c5e\u6027\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-property \u547d\u540d\uff09\u3001\u73af\u5883\u53d8\u91cf\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-environment-variable \u547d\u540d\uff09\uff0c\u6587\u672c\u6587\u4ef6\uff08\u7531\u5c5e\u6027 ds-cfg-key-store-pin-file \u547d\u540d\uff09\u4e2d\u6307\u5b9a PIN\uff0c\u6216\u8005\u76f4\u63a5\u5728\u4f7f\u7528\u5c5e\u6027 ds-cfg-key-store-pin \u7684\u6761\u76ee\u4e2d\u6307\u5b9a SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_LOAD_81=\u5728\u5c1d\u8bd5\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u7ba1\u7406\u5668\u65f6\u51fa\u73b0\u9519\u8bef: %s SEVERE_ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY_83=\u5728\u5c1d\u8bd5\u521b\u5efa\u5bc6\u94a5\u7ba1\u7406\u5668\u5e93\u4ee5\u8bbf\u95ee\u5bc6\u94a5\u5e93\u6587\u4ef6 %s \u7684\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef: %s SEVERE_ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY_84=\u5728\u5c1d\u8bd5\u521b\u5efa\u5bc6\u94a5\u7ba1\u7406\u5668\u5e93\u4ee5\u8bbf\u95ee PKCS#11 \u5bc6\u94a5\u5e93\u7684\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef: %s -- Gitblit v1.10.0