From a052caad0008ede711b0c43d9955eccc3bb858ba Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.

---
 opendj-sdk/opends/src/messages/messages/extension.properties |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/opendj-sdk/opends/src/messages/messages/extension.properties b/opendj-sdk/opends/src/messages/messages/extension.properties
index c46a3ab..16d622e 100644
--- a/opendj-sdk/opends/src/messages/messages/extension.properties
+++ b/opendj-sdk/opends/src/messages/messages/extension.properties
@@ -412,11 +412,11 @@
  entry.  Changes to this configuration attribute will take effect immediately
 SEVERE_ERR_SASLEXTERNAL_INVALID_VALIDATION_VALUE_132=Configuration entry %s \
  has an invalid value %s for attribute \
- ds-cfg-client-certificate-validation-policy.  The value must be one of \
+ ds-cfg-certificate-validation-policy.  The value must be one of \
  "always", "never", or "ifpresent"
 SEVERE_ERR_SASLEXTERNAL_CANNOT_GET_VALIDATION_POLICY_133=An unexpected error \
  occurred while attempting to determine the value of the \
- ds-cfg-client-certificate-validation-policy attribute in configuration entry \
+ ds-cfg-certificate-validation-policy attribute in configuration entry \
  %s:  %s
 INFO_SASLEXTERNAL_DESCRIPTION_CERTIFICATE_ATTRIBUTE_134=Specifies the name of \
  the attribute that will be used to hold the certificate information in user \
@@ -441,7 +441,7 @@
  attempting to validate the peer certificate presented by the client with a \
  certificate from the user's entry %s:  %s
 INFO_SASLEXTERNAL_UPDATED_VALIDATION_POLICY_140=Attribute \
- ds-cfg-client-certificate-validation-policy in configuration entry %s has \
+ ds-cfg-certificate-validation-policy in configuration entry %s has \
  been updated.  The new client certificate validation policy is %s
 INFO_SASLEXTERNAL_UPDATED_CERT_ATTR_141=Attribute \
  ds-cfg-certificate-attribute in configuration entry %s has been updated.  The \
@@ -914,21 +914,21 @@
  should be used to map the CRAM-MD5 username to a Directory Server user entry. \
  Changes to this configuration attribute will take effect immediately
 MILD_ERR_SASLCRAMMD5_NO_IDENTITY_MAPPER_ATTR_310=Configuration entry %s does \
- not contain attribute ds-cfg-identity-mapper-dn which specifies the DN of the \
+ not contain attribute ds-cfg-identity-mapper which specifies the DN of the \
  identity mapper to use in conjunction with the CRAM-MD5 SASL mechanism.  This \
  is a required attribute
 MILD_ERR_SASLCRAMMD5_NO_SUCH_IDENTITY_MAPPER_311=The identity mapper %s \
- specified in attribute ds-cfg-identity-mapper-dn of configuration entry %s \
+ specified in attribute ds-cfg-identity-mapper of configuration entry %s \
  does not reference a valid identity mapper configuration that is enabled for \
  use in the Directory Server
 MILD_ERR_SASLCRAMMD5_CANNOT_GET_IDENTITY_MAPPER_312=An error occurred while \
- trying to process the value of the ds-cfg-identity-mapper-dn attribute in \
+ trying to process the value of the ds-cfg-identity-mapper attribute in \
  configuration entry %s to determine which identity mapper should be used in \
  conjunction with the CRAM-MD5 SASL mechanism:  %s
 MILD_ERR_SASLCRAMMD5_CANNOT_MAP_USERNAME_313=An error occurred while \
  attempting to map username %s to a Directory Server entry:  %s
 INFO_SASLCRAMMD5_UPDATED_IDENTITY_MAPPER_314=Attribute \
- ds-cfg-identity-mapper-dn in configuration entry %s has been updated.  The \
+ ds-cfg-identity-mapper in configuration entry %s has been updated.  The \
  identity mapper defined in configuration entry %s will now be used to map \
  usernames to entries when processing SASL CRAM-MD5 bind requests
 INFO_SASLDIGESTMD5_DESCRIPTION_IDENTITY_MAPPER_DN_315=Specifies the DN of the \
@@ -936,21 +936,21 @@
  should be used to map the DIGEST-MD5 username to a Directory Server user \
  entry.  Changes to this configuration attribute will take effect immediately
 MILD_ERR_SASLDIGESTMD5_NO_IDENTITY_MAPPER_ATTR_316=Configuration entry %s \
- does not contain attribute ds-cfg-identity-mapper-dn which specifies the DN \
+ does not contain attribute ds-cfg-identity-mapper which specifies the DN \
  of the identity mapper to use in conjunction with the DIGEST-MD5 SASL \
  mechanism.  This is a required attribute
 MILD_ERR_SASLDIGESTMD5_NO_SUCH_IDENTITY_MAPPER_317=The identity mapper %s \
- specified in attribute ds-cfg-identity-mapper-dn of configuration entry %s \
+ specified in attribute ds-cfg-identity-mapper of configuration entry %s \
  does not reference a valid identity mapper configuration that is enabled for \
  use in the Directory Server
 MILD_ERR_SASLDIGESTMD5_CANNOT_GET_IDENTITY_MAPPER_318=An error occurred while \
- trying to process the value of the ds-cfg-identity-mapper-dn attribute in \
+ trying to process the value of the ds-cfg-identity-mapper attribute in \
  configuration entry %s to determine which identity mapper should be used in \
  conjunction with the DIGEST-MD5 SASL mechanism:  %s
 MILD_ERR_SASLDIGESTMD5_CANNOT_MAP_USERNAME_319=An error occurred while \
  attempting to map username %s to a Directory Server entry:  %s
 INFO_SASLDIGESTMD5_UPDATED_IDENTITY_MAPPER_320=Attribute \
- ds-cfg-identity-mapper-dn in configuration entry %s has been updated.  The \
+ ds-cfg-identity-mapper in configuration entry %s has been updated.  The \
  identity mapper defined in configuration entry %s will now be used to map \
  usernames to entries when processing SASL DIGEST-MD5 bind requests
 INFO_SASLPLAIN_DESCRIPTION_IDENTITY_MAPPER_DN_321=Specifies the DN of the \
@@ -958,21 +958,21 @@
  should be used to map the provided username to a Directory Server user entry. \
  Changes to this configuration attribute will take effect immediately
 MILD_ERR_SASLPLAIN_NO_IDENTITY_MAPPER_ATTR_322=Configuration entry %s does \
- not contain attribute ds-cfg-identity-mapper-dn which specifies the DN of the \
+ not contain attribute ds-cfg-identity-mapper which specifies the DN of the \
  identity mapper to use in conjunction with the PLAIN SASL mechanism.  This is \
  a required attribute
 MILD_ERR_SASLPLAIN_NO_SUCH_IDENTITY_MAPPER_323=The identity mapper %s \
- specified in attribute ds-cfg-identity-mapper-dn of configuration entry %s \
+ specified in attribute ds-cfg-identity-mapper of configuration entry %s \
  does not reference a valid identity mapper configuration that is enabled for \
  use in the Directory Server
 MILD_ERR_SASLPLAIN_CANNOT_GET_IDENTITY_MAPPER_324=An error occurred while \
- trying to process the value of the ds-cfg-identity-mapper-dn attribute in \
+ trying to process the value of the ds-cfg-identity-mapper attribute in \
  configuration entry %s to determine which identity mapper should be used in \
  conjunction with the PLAIN SASL mechanism:  %s
 MILD_ERR_SASLPLAIN_CANNOT_MAP_USERNAME_325=An error occurred while attempting \
  to map username %s to a Directory Server entry:  %s
 INFO_SASLPLAIN_UPDATED_IDENTITY_MAPPER_326=Attribute \
- ds-cfg-identity-mapper-dn in configuration entry %s has been updated.  The \
+ ds-cfg-identity-mapper in configuration entry %s has been updated.  The \
  identity mapper defined in configuration entry %s will now be used to map \
  usernames to entries when processing SASL PLAIN bind requests
 MILD_ERR_EXTOP_CANCEL_NO_REQUEST_VALUE_327=Unable to process the cancel \
@@ -989,14 +989,14 @@
  configuration attribute will take effect immediately
 MILD_ERR_PWLENGTHVALIDATOR_CANNOT_DETERMINE_MIN_LENGTH_332=An error occurred \
  while attempting to determine the minimum allowed password length from the \
- ds-cfg-minimum-password-length attribute:  %s
+ ds-cfg-min-password-length attribute:  %s
 INFO_PWLENGTHVALIDATOR_DESCRIPTION_MAX_LENGTH_333=Specifies the maximum \
  number of characters that a password will be allowed to have.  A value of \
  zero indicates that there is no maximum length.  Changes to this \
  configuration attribute will take effect immediately
 MILD_ERR_PWLENGTHVALIDATOR_CANNOT_DETERMINE_MAX_LENGTH_334=An error occurred \
  while attempting to determine the maximum allowed password length from the \
- ds-cfg-maximum-password-length attribute:  %s
+ ds-cfg-max-password-length attribute:  %s
 MILD_ERR_PWLENGTHVALIDATOR_MIN_GREATER_THAN_MAX_335=The configured minimum \
  password length of %d characters is greater than the configured maximum \
  password length of %d
@@ -1049,19 +1049,19 @@
  should be used to map the GSSAPI principal to a Directory Server user entry. \
  Changes to this configuration attribute will take effect immediately
 MILD_ERR_SASLGSSAPI_NO_IDENTITY_MAPPER_ATTR_350=Configuration entry %s does \
- not contain attribute ds-cfg-identity-mapper-dn which specifies the DN of the \
+ not contain attribute ds-cfg-identity-mapper which specifies the DN of the \
  identity mapper to use in conjunction with the GSSAPI SASL mechanism.  This \
  is a required attribute
 MILD_ERR_SASLGSSAPI_NO_SUCH_IDENTITY_MAPPER_351=The identity mapper %s \
- specified in attribute ds-cfg-identity-mapper-dn of configuration entry %s \
+ specified in attribute ds-cfg-identity-mapper of configuration entry %s \
  does not reference a valid identity mapper configuration that is enabled for \
  use in the Directory Server
 MILD_ERR_SASLGSSAPI_CANNOT_GET_IDENTITY_MAPPER_352=An error occurred while \
- trying to process the value of the ds-cfg-identity-mapper-dn attribute in \
+ trying to process the value of the ds-cfg-identity-mapper attribute in \
  configuration entry %s to determine which identity mapper should be used in \
  conjunction with the GSSAPI SASL mechanism:  %s
 INFO_SASLGSSAPI_UPDATED_IDENTITY_MAPPER_353=Attribute \
- ds-cfg-identity-mapper-dn in configuration entry %s has been updated.  The \
+ ds-cfg-identity-mapper in configuration entry %s has been updated.  The \
  value "%s" will now be used as the DN of the identity mapper configuration \
  entry for GSSAPI authentication
 MILD_ERR_EXTOP_PASSMOD_CANNOT_GET_PW_POLICY_354=An error occurred while \
@@ -1193,7 +1193,7 @@
  certificate to a user entry.  Changes to this configuration attribute will \
  take effect immediately
 MILD_ERR_SASLEXTERNAL_NO_CERTIFICATE_MAPPER_DN_407=Configuration entry %s \
- does not contain attribute ds-cfg-certificate-mapper-dn which is required to \
+ does not contain attribute ds-cfg-certificate-mapper which is required to \
  specify which certificate mapper should be used to map certificates to user \
  entries
 MILD_ERR_SASLEXTERNAL_INVALID_CERTIFICATE_MAPPER_DN_408=Configuration entry \
@@ -1203,7 +1203,7 @@
  attempting to retrieve the certificate mapper DN from configuration entry %s: \
  %s
 INFO_SASLEXTERNAL_UPDATED_CERT_MAPPER_DN_410=Attribute \
- ds-cfg-certificate-mapper-dn in configuration entry %s has been updated. \
+ ds-cfg-certificate-mapper in configuration entry %s has been updated. \
  Certificate mapper %s will now be used to map certificates to user entries
 INFO_SDTUACM_DESCRIPTION_SUBJECT_ATTR_411=Specifies the name of the attribute \
  type in user entries that contains the subjects of the certificates held by \
@@ -1326,7 +1326,7 @@
  attribute will take effect immediately
 MILD_ERR_PWDIFFERENCEVALIDATOR_CANNOT_DETERMINE_MIN_DIFFERENCE_454=An error \
  occurred while attempting to determine the minimum allowed password \
- difference from the ds-cfg-minimum-password-difference attribute:  %s
+ difference from the ds-cfg-min-password-difference attribute:  %s
 INFO_PWDIFFERENCEVALIDATOR_UPDATED_MIN_DIFFERENCE_455=The minimum password \
  difference has been updated to %d
 MILD_ERR_PWDIFFERENCEVALIDATOR_TOO_SMALL_456=The provided password differs \

--
Gitblit v1.10.0