diff options
| -rw-r--r-- | CHANGES.md | 1 | ||||
| -rw-r--r-- | cups/ppd.c | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/CHANGES.md b/CHANGES.md index 7ab8e18f2..c2635dddd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes in CUPS v2.3.1 ---------------------- - Documentation updates (Issue #5661) +- PPD files containing "custom" option keywords did not work (Issue #5639) - Added a workaround for the scheduler's systemd support (Issue #5640) - Fixed spelling of "fold-accordion". - Fixed the default common name for TLS certificates used by `ippeveprinter`. diff --git a/cups/ppd.c b/cups/ppd.c index fae19c42e..ff52df2e1 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1874,9 +1874,9 @@ _ppdOpen( { if (!_cups_strcasecmp(name, "custom") || !_cups_strncasecmp(name, "custom.", 7)) { - pg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD; - - goto error; + char cname[PPD_MAX_NAME]; /* Rewrite with a leading underscore */ + snprintf(cname, sizeof(cname), "_%s", name); + strlcpy(name, cname, sizeof(name)); } if ((size = ppdPageSize(ppd, name)) == NULL) @@ -1903,9 +1903,9 @@ _ppdOpen( { if (!_cups_strcasecmp(name, "custom") || !_cups_strncasecmp(name, "custom.", 7)) { - pg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD; - - goto error; + char cname[PPD_MAX_NAME]; /* Rewrite with a leading underscore */ + snprintf(cname, sizeof(cname), "_%s", name); + strlcpy(name, cname, sizeof(name)); } if ((size = ppdPageSize(ppd, name)) == NULL) @@ -1939,9 +1939,9 @@ _ppdOpen( if (!_cups_strcasecmp(name, "custom") || !_cups_strncasecmp(name, "custom.", 7)) { - pg->ppd_status = PPD_ILLEGAL_OPTION_KEYWORD; - - goto error; + char cname[PPD_MAX_NAME]; /* Rewrite with a leading underscore */ + snprintf(cname, sizeof(cname), "_%s", name); + strlcpy(name, cname, sizeof(name)); } if (!strcmp(keyword, "PageSize")) |