Fix JCL option support in PPD compiler (Issue #5379)

diff --git a/CHANGES.md b/CHANGES.md
index 2ee127c1adbafe35f11902a6cdfb0bcf115cce99..12d199048c37b89c74d3a2314322370c88cf8cb3 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.3b6 - 2018-08-21
+CHANGES - 2.3b6 - 2018-08-27
 ============================
 
 Changes in CUPS v2.3b6
@@ -22,6 +22,7 @@ Changes in CUPS v2.3b6
 - The IPP Everywhere "driver" no longer does local filtering when printing to
   a shared CUPS printer (Issue #5361)
 - Fixed some memory leaks discovered by Coverity (Issue #5375)
+- The PPD compiler incorrectly terminated JCL options (Issue #5379)
 - The scheduler was being backgrounded on macOS, causing applications to spin
   (rdar://40436080)
 - The scheduler did not validate that required initial request attributes were

diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx
index 1a102901d3a7101b3755d7c1b033516ea9b0ceaf..9547e91fa23e44835984f40754de2dbb394878da 100644 (file)
--- a/ppdc/ppdc-driver.cxx
+++ b/ppdc/ppdc-driver.cxx
@@ -1,7 +1,7 @@
 //
 // PPD file compiler definitions for the CUPS PPD Compiler.
 //
-// Copyright 2007-2014 by Apple Inc.
+// Copyright 2007-2018 by Apple Inc.
 // Copyright 2002-2006 by Easy Software Products.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -1103,7 +1103,10 @@ ppdcDriver::write_ppd_file(
          cupsFilePrintf(fp, "*End%s", lf);
       }
 
-      cupsFilePrintf(fp, "*CloseUI: *%s%s", o->name->value, lf);
+      if (o->section == PPDC_SECTION_JCL)
+       cupsFilePrintf(fp, "*JCLCloseUI: *%s%s", o->name->value, lf);
+      else
+       cupsFilePrintf(fp, "*CloseUI: *%s%s", o->name->value, lf);
 
       snprintf(custom, sizeof(custom), "Custom%s", o->name->value);
       if ((a = find_attr(custom, "True")) != NULL)