From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 23 May 2019 15:59:40 +0000 (-0400)
Subject: Fix `EXPECT !name WITH-VALUE ...` tests.
X-Git-Tag: v2.3.0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cf87cf506f484d0260d5879feb4fe1043c88f17;p=thirdparty%2Fcups.git

Fix `EXPECT !name WITH-VALUE ...` tests.
---

diff --git a/CHANGES.md b/CHANGES.md
index 397dca5bc0..92775846a7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
-CHANGES - 2.3rc1 - 2019-05-21
-=============================
+CHANGES - 2.3.0 - 2019-05-23
+============================
+
+
+Changes in CUPS v2.3.0
+----------------------
+
+- Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
 
 
 Changes in CUPS v2.3rc1
diff --git a/tools/ipptool.c b/tools/ipptool.c
index aca6d24cb7..e54b78ad38 100644
--- a/tools/ipptool.c
+++ b/tools/ipptool.c
@@ -1448,7 +1448,7 @@ do_test(_ipp_file_t      *f,		/* I - IPP data file */
 	      _ippVarsSet(vars, expect->define_no_match, "1");
 	    else if (!expect->define_match && !expect->define_value)
 	    {
-	      if (found && expect->not_expect)
+	      if (found && expect->not_expect && !expect->with_value && !expect->with_value_from)
 		add_stringf(data->errors, "NOT EXPECTED: %s", expect->name);
 	      else if (!found && !(expect->not_expect || expect->optional))
 		add_stringf(data->errors, "EXPECTED: %s", expect->name);