From 184ed890c828220c114f60ee165ce2230ada3d7c Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 15 May 2007 08:10:13 +0000
Subject: [PATCH] issue 1430 fix (all utilities should provide as standard option -V/--version) to specify the LDAP protocol version number, we should use now -V/--ldapVersion to get the 'product' version --version
---
opends/src/server/org/opends/server/tools/LDAPSearch.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opends/src/server/org/opends/server/tools/LDAPSearch.java
index bffff7d..c54aaf0 100644
--- a/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -887,9 +887,10 @@
MSGID_DESCRIPTION_EFFECTIVERIGHTS_ATTR );
argParser.addArgument(effectiveRightsAttrs);
- version = new IntegerArgument("version", 'V', "version", false, false,
- true, "{version}", 3, null,
- MSGID_DESCRIPTION_VERSION);
+ version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
+ OPTION_LONG_PROTOCOL_VERSION, false, false,
+ true, OPTION_VALUE_PROTOCOL_VERSION, 3,
+ null, MSGID_DESCRIPTION_VERSION);
argParser.addArgument(version);
encodingStr = new StringArgument("encoding", 'i', "encoding", false,
@@ -967,8 +968,9 @@
return 1;
}
- // If we should just display usage information, then print it and exit.
- if (argParser.usageDisplayed())
+ // If we should just display usage or version information,
+ // then print it and exit.
+ if (argParser.usageOrVersionDisplayed())
{
return 0;
}
--
Gitblit v1.10.0