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

Gaetan Boismal
20.11.2015 e67fae088ed0915557f53a71f3ce464a651d1e86
OPENDJ-1827: Fix root password check with setup --cli
1 files modified
7 ■■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java 7 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -964,12 +964,12 @@
            ERR_TRIES_LIMIT_REACHED.get(CONFIRMATION_MAX_TRIES));
      }
      char[] pwd1 = null;
      // Prompt for password and confirm.
      // Prompt for password and confirm.
      while (pwd1 == null)
      {
        pwd1 = readPassword(INFO_INSTALLDS_PROMPT_ROOT_PASSWORD.get());
        if (pwd1 == null || "".equals(pwd1))
        if (pwd1 == null || pwd1.length == 0)
        {
          pwd1 = null;
          println();
@@ -977,9 +977,8 @@
          println();
        }
      }
      char[] pwd2 =
        readPassword(INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD.get());
      char[] pwd2 = readPassword(INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD.get());
      if (Arrays.equals(pwd1, pwd2))
      {
        pwd = String.valueOf(pwd1);