From 9a04549d6ba6786324fbb70e4bc7e3fa8ff987a8 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 02 Nov 2009 09:42:43 +0000
Subject: [PATCH] Undo the changes for issue 4326 (Allow setup of a Server without Data suffix) since some tests are broken with the new behavior. The code has been left in a way that simply changing the default value of the base DN option to null, the command-line setup will allow to configure the server with no base DN.
---
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index 08fe1c8..5c047c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -769,6 +769,10 @@
// Check the validity of the base DNs
LinkedList<String> baseDNs = argParser.baseDNArg.getValues();
+ if (baseDNs.isEmpty() && argParser.baseDNArg.getDefaultValue() != null)
+ {
+ baseDNs.add(argParser.baseDNArg.getDefaultValue());
+ }
for (String baseDN : baseDNs)
{
try
@@ -1333,7 +1337,8 @@
throws UserDataException
{
boolean prompt = true;
- if (!argParser.baseDNArg.isPresent())
+ if (!argParser.baseDNArg.isPresent() &&
+ argParser.baseDNArg.getDefaultValue() == null)
{
try
{
@@ -1355,7 +1360,7 @@
else
{
// Check the validity of the base DNs
- LinkedList<String>baseDNs = promptIfRequiredForDNs(
+ LinkedList<String> baseDNs = promptIfRequiredForDNs(
argParser.baseDNArg, INFO_INSTALLDS_PROMPT_BASEDN.get(), true);
dataOptions = promptIfRequiredForDataOptions(baseDNs);
}
--
Gitblit v1.10.0