From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 3 Apr 2018 00:18:11 +0000 (-0400)
Subject: The `ipptool` program no longer checks for duplicate attributes when running in
X-Git-Tag: v2.3b5~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d07cb8d5dc91f63e18f83e229f474edfb890f4ba;p=thirdparty%2Fcups.git

The `ipptool` program no longer checks for duplicate attributes when running in
list or CSV mode (Issue #5278)
---

diff --git a/CHANGES.md b/CHANGES.md
index 896ddee04a..9dc02b4fd8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,12 @@
-CHANGES - 2.3b4 - 2018-03-23
-============================
+CHANGES - 2.3rc1 - 2018-04-02
+=============================
+
+Changes in CUPS v2.3rc1
+-----------------------
+
+- The `ipptool` program no longer checks for duplicate attributes when running
+  in list or CSV mode (Issue #5278)
+
 
 Changes in CUPS v2.3b4
 ----------------------
diff --git a/test/ipptool.c b/test/ipptool.c
index 8a5ed247d7..697ea8a962 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1269,7 +1269,7 @@ do_test(_ipp_file_t      *f,		/* I - IPP data file */
 
 	if (ippGetName(attrptr))
 	{
-	  if (cupsArrayFind(a, (void *)ippGetName(attrptr)))
+	  if (cupsArrayFind(a, (void *)ippGetName(attrptr)) && data->output < _CUPS_OUTPUT_LIST)
 	    add_stringf(data->errors, "Duplicate \"%s\" attribute in %s group",
 			ippGetName(attrptr), ippTagString(group));