From 44183752a254e21e1dccdfe43ec59abce518a1db Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 25 Sep 2007 07:32:05 +0000
Subject: [PATCH] With these modificationd, if both useSSL and useStartTls are set to false in the properties file, dsconfig interactive mode will not prompt for protocol.
---
opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 993ddbd..5d6ce55 100644
--- a/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -335,6 +335,12 @@
secureArgsList.useSSLArg.isPresent()
||
secureArgsList.useStartTLSArg.isPresent()
+ ||
+ (
+ secureArgsList.useSSLArg.isValueSetByProperty()
+ &&
+ secureArgsList.useStartTLSArg.isValueSetByProperty()
+ )
);
if (app.isInteractive() && !connectionTypeIsSet)
{
--
Gitblit v1.10.0