From 58262dc99cb9776773c0333fafcd7ff27deffc5b 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.
---
opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index 694176e..98f4a32 100644
--- a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -204,7 +204,7 @@
OPTION_LONG_BASEDN.toLowerCase(), OPTION_SHORT_BASEDN,
OPTION_LONG_BASEDN, false, true, true,
INFO_BASEDN_PLACEHOLDER.get(),
- null, OPTION_LONG_BASEDN,
+ "dc=example,dc=com", OPTION_LONG_BASEDN,
INFO_INSTALLDS_DESCRIPTION_BASEDN.get());
addArgument(baseDNArg);
@@ -661,7 +661,8 @@
errorMessages.add(message);
}
- if (noPromptArg.isPresent() && !baseDNArg.isPresent())
+ if (noPromptArg.isPresent() && !baseDNArg.isPresent() &&
+ baseDNArg.getDefaultValue() == null)
{
Argument[] args = {importLDIFArg, addBaseEntryArg, sampleDataArg};
for (Argument arg : args)
--
Gitblit v1.10.0