From 53d48707db58d3ef95e4cc672ffc94093da69e62 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Wed, 27 Jan 2016 13:53:27 +0000
Subject: [PATCH] OPENDJ-2036: add separate messages for authzID account problems
---
opendj-server-legacy/src/messages/org/opends/messages/protocol_de.properties | 3 +--
opendj-server-legacy/src/messages/org/opends/messages/protocol_fr.properties | 5 ++---
opendj-server-legacy/src/messages/org/opends/messages/protocol_ko.properties | 3 +--
opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_CN.properties | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java | 18 ++++++++++++++----
opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_TW.properties | 3 +--
opendj-server-legacy/src/messages/org/opends/messages/protocol_ja.properties | 3 +--
opendj-server-legacy/src/messages/org/opends/messages/protocol.properties | 14 ++++++++++----
opendj-server-legacy/src/messages/org/opends/messages/protocol_es.properties | 3 +--
9 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
index dcfb261..0da30ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -301,16 +301,26 @@
if (state.isDisabled())
{
- LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(userEntry.getName());
+ LocalizableMessage message = ERR_PROXYAUTH2_ACCOUNT_DISABLED.get(userEntry.getName());
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
if (state.isPasswordPolicy())
{
PasswordPolicyState pwpState = (PasswordPolicyState) state;
- if (pwpState.isAccountExpired() || pwpState.isLocked() || pwpState.isPasswordExpired())
+ if (pwpState.isAccountExpired())
{
- LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(userEntry.getName());
+ LocalizableMessage message = ERR_PROXYAUTH2_ACCOUNT_EXPIRED.get(userEntry.getName());
+ throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
+ }
+ if (pwpState.isLocked())
+ {
+ LocalizableMessage message = ERR_PROXYAUTH2_ACCOUNT_LOCKED.get(userEntry.getName());
+ throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
+ }
+ if (pwpState.isPasswordExpired())
+ {
+ LocalizableMessage message = ERR_PROXYAUTH2_PASSWORD_EXPIRED.get(userEntry.getName());
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
}
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties
index 20a27e8..60ba645 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2015 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
# Portions copyright 2013-2014 Manuel Gaupp
@@ -673,8 +673,6 @@
control for user %s is not allowed by the password policy configuration
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=Unable to obtain a lock on user \
entry %s for the proxied authorization V2 control validation
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=Use of the proxied authorization V2 \
- control for user %s is not allowed by the password policy configuration
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=Cannot decode the provided \
control as an account availability request control because the provided \
control had a value but the account availability request control should not \
@@ -920,4 +918,12 @@
ERR_TRANSACTION_ID_CONTROL_HAS_NO_VALUE_1530=No value was provided for the transaction \
id control, whereas an UTF-8 encoded value is expected
ERR_UNEXPECTED_EXCEPTION_ON_CLIENT_CONNECTION_1531=Exception on the underlying client connection: %s
-ERR_IO_ERROR_ON_CLIENT_CONNECTION_1532=The underlying client connection timed out or closed: %s
\ No newline at end of file
+ERR_IO_ERROR_ON_CLIENT_CONNECTION_1532=The underlying client connection timed out or closed: %s
+ERR_PROXYAUTH2_ACCOUNT_DISABLED_1533=Use of the proxied authorization V2 \
+ control for user %s is not allowed: the account is disabled
+ERR_PROXYAUTH2_ACCOUNT_EXPIRED_1534=Use of the proxied authorization V2 \
+ control for user %s is not allowed: the account is expired
+ERR_PROXYAUTH2_ACCOUNT_LOCKED_1535=Use of the proxied authorization V2 \
+ control for user %s is not allowed: the account is locked
+ERR_PROXYAUTH2_PASSWORD_EXPIRED_1536=Use of the proxied authorization V2 \
+ control for user %s is not allowed: the account's password is expired
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_de.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_de.properties
index 19f2634..dcb1ab6 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_de.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_de.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -266,7 +266,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=Es konnte keine Sperrung des Benutzereintrags %s f\u00fcr die \u00dcberpr\u00fcfung der Steuerung der proxyorientierten Autorisierung V1 abgerufen werden
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=Die Verwendung der Steuerung der proxyorientierten Autorisierung V1 f\u00fcr den Benutzer %s wird von der Passwortrichtlinien-Konfiguration nicht zugelassen
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=Es konnte keine Sperrung des Benutzereintrags %s f\u00fcr die \u00dcberpr\u00fcfung der Steuerung der proxyorientierten Autorisierung V2 abgerufen werden
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=Die Verwendung der Steuerung der proxyorientierten Autorisierung V2 f\u00fcr den Benutzer %s wird von der Passwortrichtlinien-Konfiguration nicht zugelassen
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=Die angegebene Steuerung kann nicht als eine Steuerung der Kontoverf\u00fcgbarkeitsanforderung entschl\u00fcsselt werden, da die angegebene Steuerung einen Wert besitzt, aber die Steuerung der Kontoverf\u00fcgbarkeitsanforderung keinen Wert besitzen darf
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=Die angegebene Steuerung der Kontoverf\u00fcgbarkeitsantwort kann nicht entschl\u00fcsselt werden, da sie keinen Wert enth\u00e4lt
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=Die Steuerung der Kontoverf\u00fcgbarkeitsantwort weist den unbekannten ACCOUNT_USABLE_RESPONSE-Elementtyp %s auf
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_es.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_es.properties
index 9c9c66b..9c79aa9 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_es.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_es.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -266,7 +266,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=No se pudo obtener un bloqueo en la entrada de usuario %s para la validaci\u00f3n del control V1 de autorizaci\u00f3n por proxy
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=No se permite que la configuraci\u00f3n de la directiva de contrase\u00f1a utilice el control V1 de autorizaci\u00f3n por proxy para el usuario %s
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=No se pudo obtener un bloqueo en la entrada de usuario %s para la validaci\u00f3n del control V2 de autorizaci\u00f3n por proxy
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=No se permite que la configuraci\u00f3n de la directiva de contrase\u00f1a utilice el control V2 de autorizaci\u00f3n por proxy para el usuario %s
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=No puede descodificarse el control proporcionado como un control de solicitud de disponibilidad de la cuenta porque el control proporcionado tiene un valor, pero el control de solicitud de disponibilidad de la cuenta no deber\u00eda tenerlo
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=No puede descodificarse el control de respuesta de disponibilidad de la cuenta proporcionado porque no tiene ning\u00fan valor
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=El control de respuesta de disponibilidad de la cuenta tiene un tipo de elemento ACCOUNT_USABLE_RESPONSE desconocido de %s
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_fr.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_fr.properties
index 267bfc3..81f0b85 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_fr.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_fr.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -266,7 +266,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=Impossible d'obtenir un verrou sur l'entr\u00e9e utilisateur %s pour la validation de contr\u00f4le V1 d'autorisation en proxy
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=L'utilisation du contr\u00f4le V1 d'autorisation en proxy pour l'utilisateur %s n'est pas autoris\u00e9e par la configuration de strat\u00e9gie de mot de passe
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=Impossible d'obtenir un verrou sur l'entr\u00e9e utilisateur %s pour la validation de contr\u00f4le V2 d'autorisation en proxy
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=L'utilisation du contr\u00f4le V2 d'autorisation en proxy pour l'utilisateur %s n'est pas autoris\u00e9e par la configuration de strat\u00e9gie de mot de passe
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=Impossible\u00b7de\u00b7d\u00e9coder\u00b7le\u00b7contr\u00f4le\u00b7fourni\u00b7en\u00b7tant\u00b7que\u00b7contr\u00f4le\u00b7de\u00b7requ\u00eate\u00b7de\u00b7disponibilit\u00e9 de compte car\u00b7il\u00b7comporte\u00b7une\u00b7valeur\u00b7alors\u00b7qu\u2019un\u00b7contr\u00f4le\u00b7de\u00b7requ\u00eate\u00b7de\u00b7disponibilit\u00e9 de compte ne doit avoir aucune valeur
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=Impossible de d\u00e9coder le contr\u00f4le de r\u00e9ponse de disponibilit\u00e9 de compte fourni, car il ne poss\u00e8de pas de valeur
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=Le contr\u00f4le de r\u00e9ponse de disponibilit\u00e9 de compte comporte le type d\u2019\u00e9l\u00e9ment ACCOUNT_USABLE_RESPONSE inconnu %s
@@ -347,4 +346,4 @@
ERR_ECLN_NO_CONTROL_VALUE_1509=Impossible de d\u00e9coder le contr\u00f4le de notification de journal de modifications d'entr\u00e9e fourni, car il ne poss\u00e8de pas de valeur
ERR_ECLN_CANNOT_DECODE_VALUE_1510=Impossible de d\u00e9coder le contr\u00f4le de notification de journal de modifications d'entr\u00e9e fourni, car une erreur s'est produite lors de la tentative de d\u00e9codage de sa valeur : %s
ERR_UNEXPECTED_CONNECTION_CLOSURE_1511=La connexion \u00e0 Directory Server a \u00e9t\u00e9 ferm\u00e9e lors de l\u2019attente de la r\u00e9ponse
-ERR_CONNHANDLER_CONFIG_CHANGES_REQUIRE_RESTART_1516=Le serveur a re\u00e7u des changements de configuration qui n\u00e9cessitent de r\u00e9demarrer le gestionnaire de connexion %s pour les appliquer
\ No newline at end of file
+ERR_CONNHANDLER_CONFIG_CHANGES_REQUIRE_RESTART_1516=Le serveur a re\u00e7u des changements de configuration qui n\u00e9cessitent de r\u00e9demarrer le gestionnaire de connexion %s pour les appliquer
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_ja.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_ja.properties
index dd76dc6..45ef80d 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_ja.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_ja.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -264,7 +264,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=\u30d7\u30ed\u30ad\u30b7\u8a2d\u5b9a\u3055\u308c\u305f\u8a8d\u53ef V1 \u5236\u5fa1\u59a5\u5f53\u6027\u691c\u67fb\u306e\u305f\u3081\u306e\u3001\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea %s \u306e\u30ed\u30c3\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=\u30d7\u30ed\u30ad\u30b7\u8a2d\u5b9a\u3055\u308c\u305f\u8a8d\u53ef V1 \u5236\u5fa1\u3092\u30e6\u30fc\u30b6\u30fc %s \u306b\u5bfe\u3057\u3066\u4f7f\u7528\u3059\u308b\u3053\u3068\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u30dd\u30ea\u30b7\u30fc\u69cb\u6210\u306b\u3088\u3063\u3066\u8a31\u53ef\u3055\u308c\u307e\u305b\u3093
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=\u30d7\u30ed\u30ad\u30b7\u8a2d\u5b9a\u3055\u308c\u305f\u8a8d\u53ef V2 \u5236\u5fa1\u59a5\u5f53\u6027\u691c\u67fb\u306e\u305f\u3081\u306e\u3001\u30e6\u30fc\u30b6\u30fc\u30a8\u30f3\u30c8\u30ea %s \u306e\u30ed\u30c3\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=\u30d7\u30ed\u30ad\u30b7\u8a2d\u5b9a\u3055\u308c\u305f\u8a8d\u53ef V2 \u5236\u5fa1\u3092\u30e6\u30fc\u30b6\u30fc %s \u306b\u5bfe\u3057\u3066\u4f7f\u7528\u3059\u308b\u3053\u3068\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u30dd\u30ea\u30b7\u30fc\u69cb\u6210\u306b\u3088\u3063\u3066\u8a31\u53ef\u3055\u308c\u307e\u305b\u3093
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=\u6307\u5b9a\u3055\u308c\u305f\u5236\u5fa1\u3092\u30a2\u30ab\u30a6\u30f3\u30c8\u53ef\u7528\u6027\u8981\u6c42\u5236\u5fa1\u3068\u3057\u3066\u5fa9\u53f7\u5316\u3067\u304d\u307e\u305b\u3093\u3002\u6307\u5b9a\u3055\u308c\u305f\u5236\u5fa1\u306b\u306f\u5024\u304c\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u30a2\u30ab\u30a6\u30f3\u30c8\u53ef\u7528\u6027\u8981\u6c42\u5236\u5fa1\u306b\u5024\u3092\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=\u6307\u5b9a\u3055\u308c\u305f\u30a2\u30ab\u30a6\u30f3\u30c8\u53ef\u7528\u6027\u5fdc\u7b54\u5236\u5fa1\u3092\u5fa9\u53f7\u5316\u3067\u304d\u307e\u305b\u3093\u3002\u5024\u304c\u3042\u308a\u307e\u305b\u3093
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=\u30a2\u30ab\u30a6\u30f3\u30c8\u53ef\u7528\u6027\u5fdc\u7b54\u5236\u5fa1\u306b\u4e0d\u660e\u306a ACCOUNT_USABLE_RESPONSE \u8981\u7d20\u30bf\u30a4\u30d7 %s \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3057\u305f
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_ko.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_ko.properties
index 785d123..0928135 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_ko.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_ko.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -264,7 +264,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=\ud504\ub85d\uc2dc \uc778\uc99d V1 \uc81c\uc5b4 \uac80\uc99d\uc5d0\uc11c\ub294 \uc0ac\uc6a9\uc790 \ud56d\ubaa9 %s\uc5d0 \ub300\ud55c \uc7a0\uae08\uc744 \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=\ube44\ubc00\ubc88\ud638 \uc815\ucc45 \uad6c\uc131\uc5d0 \ub530\ub77c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud574 \ud504\ub85d\uc2dc \uc778\uc99d V1 \uc81c\uc5b4\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=\ud504\ub85d\uc2dc \uc778\uc99d V2 \uc81c\uc5b4 \uac80\uc99d\uc5d0\uc11c\ub294 \uc0ac\uc6a9\uc790 \ud56d\ubaa9 %s\uc5d0 \ub300\ud55c \uc7a0\uae08\uc744 \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=\ube44\ubc00\ubc88\ud638 \uc815\ucc45 \uad6c\uc131\uc5d0 \ub530\ub77c \uc0ac\uc6a9\uc790 %s\uc5d0 \ub300\ud574 \ud504\ub85d\uc2dc \uc778\uc99d V2 \uc81c\uc5b4\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=\uc81c\uacf5\ub41c \uc81c\uc5b4\uc5d0 \uac12\uc774 \uc788\uc9c0\ub9cc \uacc4\uc815 \uac00\uc6a9\uc131 \uc694\uccad \uc81c\uc5b4\ub294 \uac12\uc744 \uac00\uc9c8 \uc218 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uc81c\uacf5\ub41c \uc81c\uc5b4\ub97c \uacc4\uc815 \uac00\uc6a9\uc131 \uc694\uccad \uc81c\uc5b4\ub85c \ud574\ub3c5\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=\ud574\ub2f9 \uc81c\uc5b4\uc5d0 \uac12\uc774 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uc81c\uacf5\ub41c \uacc4\uc815 \uac00\uc6a9\uc131 \uc751\ub2f5 \uc81c\uc5b4\ub97c \ud574\ub3c5\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=\uacc4\uc815 \uac00\uc6a9\uc131 \uc751\ub2f5 \uc81c\uc5b4\uc5d0 \uc54c \uc218 \uc5c6\ub294 %s ACCOUNT_USABLE_RESPONSE \uc694\uc18c \uc720\ud615\uc774 \uc788\uc2b5\ub2c8\ub2e4.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_CN.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_CN.properties
index e6cc956..328f54e 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_CN.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_CN.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -264,7 +264,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=\u65e0\u6cd5\u9501\u5b9a\u7528\u6237\u6761\u76ee %s \u4ee5\u9a8c\u8bc1\u4ee3\u7406\u6388\u6743 V1 \u63a7\u5236
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=\u5bc6\u7801\u7b56\u7565\u914d\u7f6e\u4e0d\u5141\u8bb8\u5c06\u4ee3\u7406\u6388\u6743 V1 \u63a7\u5236\u7528\u4e8e\u7528\u6237 %s
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=\u65e0\u6cd5\u9501\u5b9a\u7528\u6237\u6761\u76ee %s \u4ee5\u9a8c\u8bc1\u4ee3\u7406\u6388\u6743 V2 \u63a7\u5236
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=\u5bc6\u7801\u7b56\u7565\u914d\u7f6e\u4e0d\u5141\u8bb8\u5c06\u4ee3\u7406\u6388\u6743 V2 \u63a7\u5236\u7528\u4e8e\u7528\u6237 %s
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=\u65e0\u6cd5\u5c06\u63d0\u4f9b\u7684\u63a7\u5236\u89e3\u7801\u4e3a\u5e10\u6237\u53ef\u7528\u6027\u8bf7\u6c42\u63a7\u5236\uff0c\u56e0\u4e3a\u63d0\u4f9b\u7684\u63a7\u5236\u542b\u6709\u503c\uff0c\u4f46\u662f\u5e10\u6237\u53ef\u7528\u6027\u8bf7\u6c42\u63a7\u5236\u4e0d\u5e94\u5305\u542b\u4efb\u4f55\u503c
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=\u65e0\u6cd5\u89e3\u7801\u63d0\u4f9b\u7684\u5e10\u6237\u53ef\u7528\u6027\u54cd\u5e94\u63a7\u5236\uff0c\u56e0\u4e3a\u8be5\u63a7\u5236\u6ca1\u6709\u503c
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=\u5e10\u6237\u53ef\u7528\u6027\u54cd\u5e94\u63a7\u5236\u5305\u542b\u672a\u77e5 ACCOUNT_USABLE_RESPONSE \u5143\u7d20\u7c7b\u578b %s
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_TW.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_TW.properties
index aa17ee7..fcbdc67 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_TW.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol_zh_TW.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2013-2014 ForgeRock AS
+# Portions Copyright 2013-2016 ForgeRock AS
@@ -264,7 +264,6 @@
ERR_PROXYAUTH1_CANNOT_LOCK_USER_371=\u7121\u6cd5\u53d6\u5f97\u5c0d\u4f7f\u7528\u8005\u9805\u76ee %s \u7684\u9396\u5b9a\uff0c\u4ee5\u9032\u884c\u4ee3\u7406\u6388\u6b0a V1 \u63a7\u5236\u9a57\u8b49
ERR_PROXYAUTH1_UNUSABLE_ACCOUNT_372=\u5bc6\u78bc\u7b56\u7565\u914d\u7f6e\u4e0d\u5141\u8a31\u4f7f\u7528\u8005 %s \u4f7f\u7528\u4ee3\u7406\u6388\u6b0a V1 \u63a7\u5236
ERR_PROXYAUTH2_CANNOT_LOCK_USER_373=\u7121\u6cd5\u53d6\u5f97\u5c0d\u4f7f\u7528\u8005\u9805\u76ee %s \u7684\u9396\u5b9a\uff0c\u4ee5\u9032\u884c\u4ee3\u7406\u6388\u6b0a V2 \u63a7\u5236\u9a57\u8b49
-ERR_PROXYAUTH2_UNUSABLE_ACCOUNT_374=\u5bc6\u78bc\u7b56\u7565\u914d\u7f6e\u4e0d\u5141\u8a31\u4f7f\u7528\u8005 %s \u4f7f\u7528\u4ee3\u7406\u6388\u6b0a V2 \u63a7\u5236
ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE_375=\u7121\u6cd5\u5c07\u63d0\u4f9b\u7684\u63a7\u5236\u89e3\u78bc\u70ba\u5e33\u865f\u53ef\u7528\u6027\u8acb\u6c42\u63a7\u5236\uff0c\u56e0\u70ba\u63d0\u4f9b\u7684\u63a7\u5236\u542b\u6709\u503c\uff0c\u4f46\u5e33\u865f\u53ef\u7528\u6027\u8acb\u6c42\u63a7\u5236\u4e0d\u61c9\u6709\u4efb\u4f55\u503c
ERR_ACCTUSABLERES_NO_CONTROL_VALUE_376=\u7121\u6cd5\u89e3\u78bc\u63d0\u4f9b\u7684\u5e33\u865f\u53ef\u7528\u6027\u56de\u61c9\u63a7\u5236\uff0c\u56e0\u70ba\u8a72\u63a7\u5236\u4e0d\u542b\u4efb\u4f55\u503c
ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE_378=\u5e33\u865f\u53ef\u7528\u6027\u56de\u61c9\u63a7\u5236\u5177\u6709\u4e0d\u660e\u7684 ACCOUNT_USABLE_RESPONSE \u5143\u7d20\u985e\u578b %s
--
Gitblit v1.10.0