mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

dugan
17.16.2007 bab3151ddc5735095ad187d523f07fe52b6c9756
Issue 2767: Using entryDN attribute with userattr inheritance is broken. 
1 files modified
24 ■■■■ changed files
opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java 24 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -69,11 +69,6 @@
    private int numLevels;
    /*
     * The attribute type parsed from the rule.
     */
    private AttributeType attributeType;
    /*
     * The attribute type string parsed from the rule. Only used in
     * inheritance search.
     */
@@ -117,10 +112,6 @@
                    WARN_ACI_SYNTAX_INVALID_ATTRIBUTE_TYPE_NAME.get(pattern);
                throw new AciException(message);
               }
               if((this.attributeType =
                    DirectoryServer.getAttributeType(pattern)) == null)
                this.attributeType =
                        DirectoryServer.getDefaultAttributeType(pattern);
               numLevels=1;
              levels[0]=0;
            }
@@ -161,10 +152,6 @@
                    WARN_ACI_SYNTAX_INVALID_ATTRIBUTE_TYPE_NAME.get(toks[1]);
                throw new AciException(message);
            }
            if((this.attributeType =
                DirectoryServer.getAttributeType(toks[1])) == null)
                this.attributeType =
                    DirectoryServer.getDefaultAttributeType(toks[1]);
            attrTypeStr=toks[1];
            StringTokenizer tok=new StringTokenizer(toks[0],"],",false);
            while(tok.hasMoreTokens()) {
@@ -212,10 +199,6 @@
              throw new AciException(message);
            }
          }
          if((this.attributeType =
                  DirectoryServer.getAttributeType(attrTypeStr)) == null)
            this.attributeType =
                    DirectoryServer.getDefaultAttributeType(attrTypeStr);
          numLevels=1;
          levels[0]=0;
        }
@@ -244,7 +227,12 @@
     * @return The attribute type.
     */
    public AttributeType getAttributeType() {
        return attributeType;
      AttributeType attrType;
      if((attrType =
           DirectoryServer.getAttributeType(attrTypeStr.toLowerCase())) == null)
        attrType=
             DirectoryServer.getDefaultAttributeType(attrTypeStr.toLowerCase());
      return attrType;
    }
    /**