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

Nicolas Capponi
07.49.2016 cd178f0abd653155b713552bde16a14747d42f43
OPENDJ-3270 Uninstalling server without bind password now returns usage if the password is needed
2 files modified
6 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java 3 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java 3 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -96,9 +96,6 @@
    final Set<DN> alternateBindDNs = new HashSet<>();
    try
    {
      DirectoryServer.getInstance().initializeConfiguration();
      readSchemaIfNeeded(errors);
      readConfig(connectionHandlers, backendDescriptors, alternateBindDNs, errors);
    }
    catch (final OpenDsException oe)
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -1051,6 +1051,9 @@
      info.setTrustManager(userData.getTrustManager());
      info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
      info.setConnectTimeout(getConnectTimeout());
      if (userData.getAdminPwd() == null) {
        throw new UserDataException(null, LocalizableMessage.raw("No administrator password provided"));
      }
      conn = new ConnectionWrapper(
          info.getAdminConnectorHostPort(), connectionType,
          getAdministratorDN(userData.getAdminUID()), userData.getAdminPwd(),