Fix typo in ACI keyword: targattrfilters is the keyword name (since Sun DS ...

ludovicp

27.19.2010 15cd74bebe665b957da6f0fe95ff1e72f3955b8c

Fix typo in ACI keyword: targattrfilters is the keyword name (since Sun DS 5.0).

 opends/src/messages/messages/access_control.properties

@@ -163,7 +163,7 @@
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=The provided Access Control \
 Instruction (ACI) target keyword value "%s" is invalid. A valid target \
 keyword value is one of the following: target, targetscope, targetfilter, \
 targetattr or targetattrfilters
 targetattr or targattrfilters
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=The provided Access \
 Control Instruction (ACI) target operator value "%s" is invalid. The only \
 valid target operator value for the "%s" keyword is '='

 opends/src/messages/messages/access_control_de.properties

@@ -155,7 +155,7 @@
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=The provided Access Control \
### Instruction (ACI) target keyword value "%s" is invalid. A valid target \
### keyword value is one of the following: target, targetscope, targetfilter, \
### targetattr or targetattrfilters
### targetattr or targattrfilters
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=The provided Access \
### Control Instruction (ACI) target operator value "%s" is invalid. The only \
### valid target operator value for the "%s" keyword is '='

 opends/src/messages/messages/access_control_es.properties

@@ -155,7 +155,7 @@
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=The provided Access Control \
### Instruction (ACI) target keyword value "%s" is invalid. A valid target \
### keyword value is one of the following: target, targetscope, targetfilter, \
### targetattr or targetattrfilters
### targetattr or targattrfilters
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=The provided Access \
### Control Instruction (ACI) target operator value "%s" is invalid. The only \
### valid target operator value for the "%s" keyword is '='

 opends/src/messages/messages/access_control_fr.properties

@@ -155,7 +155,7 @@
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=The provided Access Control \
### Instruction (ACI) target keyword value "%s" is invalid. A valid target \
### keyword value is one of the following: target, targetscope, targetfilter, \
### targetattr or targetattrfilters
### targetattr or targattrfilters
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=The provided Access \
### Control Instruction (ACI) target operator value "%s" is invalid. The only \
### valid target operator value for the "%s" keyword is '='

 opends/src/messages/messages/access_control_ja.properties

@@ -155,7 +155,7 @@
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=The provided Access Control \
### Instruction (ACI) target keyword value "%s" is invalid. A valid target \
### keyword value is one of the following: target, targetscope, targetfilter, \
### targetattr or targetattrfilters
### targetattr or targattrfilters
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=The provided Access \
### Control Instruction (ACI) target operator value "%s" is invalid. The only \
### valid target operator value for the "%s" keyword is '='

 opends/src/messages/messages/access_control_ko.properties

@@ -80,7 +80,7 @@
SEVERE_WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED_31=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ubc14\uc778\ub4dc \uaddc\uce59 userattr \ud45c\ud604\uc2dd \uc0c1\uc18d \ud328\ud134 \uac12 \"%s\"\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uc0c1\uc18d \uc218\uc900 \uac12\uc740 \ucd5c\ub300 \uc218\uc900 \uc81c\ud55c %s\uc744(\ub97c) \ucd08\uacfc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_INVALID_INHERITANCE_VALUE_32=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ubc14\uc778\ub4dc \uaddc\uce59 userattr \ud45c\ud604\uc2dd \uc0c1\uc18d \ud328\ud134 \uac12 \"%s\"\uc740(\ub294) \uc22b\uc790\uac00 \uc544\ub2c8\ubbc0\ub85c \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_SYNTAX_33=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ub300\uc0c1 \uaddc\uce59 \uac12 \"%s\"\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\ud55c \ub300\uc0c1 \uaddc\uce59 \uac12\uc740 \ud0a4\uc6cc\ub4dc \uc5f0\uc0b0\uc790 "\ud45c\ud604\uc2dd" \ud615\uc2dd\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ub300\uc0c1 \ud0a4\uc6cc\ub4dc \uac12 \"%s\"\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\ud55c \ub300\uc0c1 \ud0a4\uc6cc\ub4dc \uac12\uc740 target, targetscope, targetfilter, targetattr \ub610\ub294 targetattrfilters \uc911 \ud558\ub098\uc785\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ub300\uc0c1 \ud0a4\uc6cc\ub4dc \uac12 \"%s\"\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\ud55c \ub300\uc0c1 \ud0a4\uc6cc\ub4dc \uac12\uc740 target, targetscope, targetfilter, targetattr \ub610\ub294 targattrfilters \uc911 \ud558\ub098\uc785\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ub300\uc0c1 \uc5f0\uc0b0\uc790 \uac12 \"%s\"\uc774(\uac00) \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \"%s\" \ud0a4\uc6cc\ub4dc\uc758 \uc720\ud6a8\ud55c \ub300\uc0c1 \uc5f0\uc0b0\uc790 \uac12\uc740 '='\ubfd0\uc785\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_TARGET_KEYWORD_NOT_SUPPORTED_36=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ub300\uc0c1 \ud0a4\uc6cc\ub4dc \uac12 \"%s\"\uc740(\ub294) \ud604\uc7ac \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_DUPLICATE_KEYWORDS_37=\uc81c\uacf5\ub41c ACI(\uc561\uc138\uc2a4 \uc81c\uc5b4 \uba85\ub839) \ub300\uc0c1 \ud0a4\uc6cc\ub4dc \uac12 \"%s\"\uc774(\uac00) ACI \"%s\"\uc5d0 \uc5ec\ub7ec \uac1c \uc788\uc2b5\ub2c8\ub2e4.

 opends/src/messages/messages/access_control_zh_CN.properties

@@ -155,7 +155,7 @@
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=The provided Access Control \
### Instruction (ACI) target keyword value "%s" is invalid. A valid target \
### keyword value is one of the following: target, targetscope, targetfilter, \
### targetattr or targetattrfilters
### targetattr or targattrfilters
###SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=The provided Access \
### Control Instruction (ACI) target operator value "%s" is invalid. The only \
### valid target operator value for the "%s" keyword is '='

 opends/src/messages/messages/access_control_zh_TW.properties

@@ -80,7 +80,7 @@
SEVERE_WARN_ACI_SYNTAX_MAX_USERATTR_INHERITANCE_LEVEL_EXCEEDED_31=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u9023\u7d50\u898f\u5247 userattr \u8868\u793a\u5f0f\u7e7c\u627f\u6a23\u5f0f\u503c\u300c%s\u300d\u7121\u6548\u3002\u7e7c\u627f\u5c64\u7d1a\u503c\u4e0d\u80fd\u8d85\u904e %s \u7684\u6700\u5927\u5c64\u7d1a\u9650\u5236
SEVERE_WARN_ACI_SYNTAX_INVALID_INHERITANCE_VALUE_32=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u9023\u7d50\u898f\u5247 userattr \u8868\u793a\u5f0f\u7e7c\u627f\u6a23\u5f0f\u503c\u300c%s\u300d\u7121\u6548\uff0c\u56e0\u70ba\u8a72\u503c\u4e0d\u662f\u6578\u5b57
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_SYNTAX_33=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u76ee\u6a19\u898f\u5247\u503c\u300c%s\u300d\u7121\u6548\u3002\u6709\u6548\u7684\u76ee\u6a19\u898f\u5247\u503c\u5fc5\u9808\u70ba\u4e0b\u5217\u5f62\u5f0f\uff1akeyword operator "expression" (\u95dc\u9375\u5b57 \u904b\u7b97\u5b50 "\u8868\u793a\u5f0f")
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u76ee\u6a19\u95dc\u9375\u5b57\u503c\u300c%s\u300d\u7121\u6548\u3002\u6709\u6548\u7684\u76ee\u6a19\u95dc\u9375\u5b57\u503c\u70ba\u4e0b\u5217\u5176\u4e2d\u4e00\u9805\uff1atarget\u3001targetscope\u3001targetfilter\u3001targetattr \u6216 targetattrfilters
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_KEYWORD_34=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u76ee\u6a19\u95dc\u9375\u5b57\u503c\u300c%s\u300d\u7121\u6548\u3002\u6709\u6548\u7684\u76ee\u6a19\u95dc\u9375\u5b57\u503c\u70ba\u4e0b\u5217\u5176\u4e2d\u4e00\u9805\uff1atarget\u3001targetscope\u3001targetfilter\u3001targetattr \u6216 targattrfilters
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_NOT_OPERATOR_35=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u76ee\u6a19\u904b\u7b97\u5b50\u503c\u300c%s\u300d\u7121\u6548\u3002\u300c%s\u300d\u95dc\u9375\u5b57\u7684\u552f\u4e00\u6709\u6548\u76ee\u6a19\u904b\u7b97\u5b50\u503c\u70ba\u300c=\u300d
SEVERE_WARN_ACI_SYNTAX_TARGET_KEYWORD_NOT_SUPPORTED_36=\u6b64\u6642\u4e0d\u652f\u63f4\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u76ee\u6a19\u95dc\u9375\u5b57\u503c\u300c%s\u300d
SEVERE_WARN_ACI_SYNTAX_INVALID_TARGET_DUPLICATE_KEYWORDS_37=\u63d0\u4f9b\u7684\u5b58\u53d6\u63a7\u5236\u6307\u4ee4 (ACI) \u76ee\u6a19\u95dc\u9375\u5b57\u503c\u300c%s\u300d\u5728 ACI\u300c%s\u300d\u4e2d\u591a\u6b21\u51fa\u73fe

 opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 */

package org.opends.server.authorization.dseecompat;
@@ -184,7 +184,7 @@
   * @param flag  The integer value specifying either a deny or allow, but not
   * both.
   *
   * @return  {@code true} if the ACI has an targetattrfilters keyword.
   * @return  {@code true} if the ACI has an targattrfilters keyword.
   */
    public boolean hasTargAttrFiltersMatchOp(int flag);


 opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 */
package org.opends.server.authorization.dseecompat;

@@ -717,13 +717,14 @@
          buildAciValue("name", "invalid", "targetattr", "cn ||", "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "invalid", "targetattr", "not/an/attr", "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "invalid", "targetattr", "cn", "allow (write)", BIND_RULE_INVALID_DAY),
          buildAciValue("name", "bad_filters", "targetattrfilters",TARG_ATTR_FILTERS_INVALID_FILTER, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_op", "targetattrfilters",TARG_ATTR_FILTERS_BAD_OP, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_op_match", "targetattrfilters",TARG_ATTR_FILTERS_BAD_OP_MATCH, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_filter_attr", "targetattrfilters",TARG_ATTR_FILTERS_BAD_FILTER_ATTR, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_format", "targetattrfilters",TARG_ATTR_FILTERS_BAD_FORMAT, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "too_many_lists", "targetattrfilters",TARG_ATTR_FILTERS_TOO_MANY_LISTS, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_tok", "targetattrfilters",TARG_ATTR_FILTERS_BAD_TOK, "allow (write)", BIND_RULE_USERDN_SELF),
          // Add tests with invalid keywords : typos in "targetattr", "targattfilters", "targetfilter"
          buildAciValue("name", "bad_filters", "targattrfilters",TARG_ATTR_FILTERS_INVALID_FILTER, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_op", "targattrfilters",TARG_ATTR_FILTERS_BAD_OP, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_op_match", "targattrfilters",TARG_ATTR_FILTERS_BAD_OP_MATCH, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_filter_attr", "targattrfilters",TARG_ATTR_FILTERS_BAD_FILTER_ATTR, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_format", "targattrfilters",TARG_ATTR_FILTERS_BAD_FORMAT, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "too_many_lists", "targattrfilters",TARG_ATTR_FILTERS_TOO_MANY_LISTS, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_tok", "targattrfilters",TARG_ATTR_FILTERS_BAD_TOK, "allow (write)", BIND_RULE_USERDN_SELF),
          buildAciValue("name", "bad_targetfilter", "targetfilter","this is a bad filter", "allow (write)", BIND_RULE_USERDN_SELF),
         buildAciValue("name", "bad targetScope", "targetScope", "sub_tree", "allow (write)", BIND_RULE_USERDN_SELF),
         buildAciValue("name", "bad right", "targetattr", "*", "allow (read, write, add, delete, search, compare, selfwrite, all, foo)", BIND_RULE_USERDN_SELF),