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

Nicolas Capponi
08.55.2014 c3ddd7489abd06155b872cc23cef3575e2ee1b9a
opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -358,11 +358,11 @@
          authzDN = actualAuthzDN;
        }
        if (! authzDN.equals(userEntry.getDN()))
        if (! authzDN.equals(userEntry.getName()))
        {
          AuthenticationInfo tempAuthInfo =
            new AuthenticationInfo(userEntry,
                     DirectoryServer.isRootDN(userEntry.getDN()));
                     DirectoryServer.isRootDN(userEntry.getName()));
          InternalClientConnection tempConn =
               new InternalClientConnection(tempAuthInfo);
          if (! tempConn.hasPrivilege(Privilege.PROXIED_AUTH, bindOperation))
@@ -370,7 +370,7 @@
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
            Message message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
                    String.valueOf(userEntry.getDN()));
                    String.valueOf(userEntry.getName()));
            bindOperation.setAuthFailureReason(message);
            return;
          }
@@ -460,11 +460,11 @@
        }
        if ((authZEntry == null) ||
            (! authZEntry.getDN().equals(userEntry.getDN())))
            (! authZEntry.getName().equals(userEntry.getName())))
        {
          AuthenticationInfo tempAuthInfo =
            new AuthenticationInfo(userEntry,
                     DirectoryServer.isRootDN(userEntry.getDN()));
                     DirectoryServer.isRootDN(userEntry.getName()));
          InternalClientConnection tempConn =
               new InternalClientConnection(tempAuthInfo);
          if (! tempConn.hasPrivilege(Privilege.PROXIED_AUTH, bindOperation))
@@ -472,7 +472,7 @@
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
            Message message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
                    String.valueOf(userEntry.getDN()));
                    String.valueOf(userEntry.getName()));
            bindOperation.setAuthFailureReason(message);
            return;
          }
@@ -518,7 +518,7 @@
      bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
      Message message = ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY.get(
              String.valueOf(userEntry.getDN()),
              String.valueOf(userEntry.getName()),
              String.valueOf(e));
      bindOperation.setAuthFailureReason(message);
      return;
@@ -531,7 +531,7 @@
    AuthenticationInfo authInfo =
         new AuthenticationInfo(userEntry, authZEntry, SASL_MECHANISM_PLAIN,
                                bindOperation.getSASLCredentials(),
                                DirectoryServer.isRootDN(userEntry.getDN()));
                                DirectoryServer.isRootDN(userEntry.getName()));
    bindOperation.setAuthenticationInfo(authInfo);
    return;
  }