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

diff --git a/CHANGES.md b/CHANGES.md
index bbbab0ddfccc5c073dbbf7ef236eafa4a070b6a8..817ef0610e151de204a3d292810261dc584b4267 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.9 - 2018-08-21
+CHANGES - 2.2.9 - 2018-08-27
 ============================
 
 
@@ -20,6 +20,7 @@ Changes in CUPS v2.2.9
 - 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 242924bc814867fef4a56a12054645350f60150c..2b6940e4efda554b2520b2c4ec63abc089699cda 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.
 //
 // These coded instructions, statements, and computer programs are the
@@ -1107,7 +1107,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)