From ffa1e3ba39812d1f3a2a4a468bcf93e781e7073e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 07 Apr 2009 09:27:31 +0000
Subject: [PATCH] Fix for issue 3194 (ldapcompare should complain about extra arguments) Add an extra check.
---
opendj-sdk/opends/src/messages/messages/tools.properties | 4 ++++
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java | 9 +++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index 58d028b..95b0f2a 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -2471,4 +2471,8 @@
SEVERE_ERR_STOPDS_DATETIME_ALREADY_PASSED_1669=The specified stop time '%s' \
has already passed
+SEVERE_ERR_LDAPCOMPARE_FILENAME_AND_DNS_1670=Both entry DNs and a file name \
+ were provided for the compare operation. These arguments are not compatible
+
+
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
index a133b14..97dfa96 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
@@ -659,6 +659,15 @@
return 1;
}
+ // If trailing DNs were provided and the filename argument was also
+ // provided, exit with an error.
+ if (!dnStrings.isEmpty() && filename.isPresent())
+ {
+ err.println(wrapText(ERR_LDAPCOMPARE_FILENAME_AND_DNS.get(),
+ MAX_LINE_WIDTH));
+ return 1;
+ }
+
// parse the attribute string
int idx = attributeString.indexOf(":");
if(idx == -1)
--
Gitblit v1.10.0