From ad538a4677b2acebc4b0968907c801172faa2d47 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 30 Oct 2009 22:51:47 +0000
Subject: [PATCH] Fix for issue 4326 (Allow setup of a Server without Data suffix)
---
opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 18 ++++++++++++++++--
1 files changed, 16 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 b01b300..694176e 100644
--- a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
@@ -43,6 +43,7 @@
import org.opends.quicksetup.util.Utils;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.util.SetupUtils;
+import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.BooleanArgument;
@@ -203,7 +204,7 @@
OPTION_LONG_BASEDN.toLowerCase(), OPTION_SHORT_BASEDN,
OPTION_LONG_BASEDN, false, true, true,
INFO_BASEDN_PLACEHOLDER.get(),
- "dc=example,dc=com", OPTION_LONG_BASEDN,
+ null, OPTION_LONG_BASEDN,
INFO_INSTALLDS_DESCRIPTION_BASEDN.get());
addArgument(baseDNArg);
@@ -659,6 +660,19 @@
sampleDataArg.getLongIdentifier());
errorMessages.add(message);
}
+
+ if (noPromptArg.isPresent() && !baseDNArg.isPresent())
+ {
+ Argument[] args = {importLDIFArg, addBaseEntryArg, sampleDataArg};
+ for (Argument arg : args)
+ {
+ if (arg.isPresent())
+ {
+ errorMessages.add(ERR_INSTALLDS_NO_BASE_DN_AND_CONFLICTING_ARG.get(
+ "--"+arg.getLongIdentifier()));
+ }
+ }
+ }
}
/**
--
Gitblit v1.10.0