fix loading ippeveps in ippeveprinter if only the command name is provided

This commit is contained in:
Zdenek Dohnal 2023-03-02 17:14:10 +01:00
parent 81c09fca23
commit 787f4a35bc
2 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,16 @@
diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index d3daffafe..857ba7cf7 100644
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -1634,9 +1634,9 @@ create_printer(
{
snprintf(path, sizeof(path), "%s/command/%s", cg->cups_serverbin, command);
- if (access(command, X_OK))
+ if (access(path, X_OK))
{
- _cupsLangPrintf(stderr, _("Unable to execute command \"%s\": %s"), command, strerror(errno));
+ _cupsLangPrintf(stderr, _("Unable to execute command \"%s\": %s"), path, strerror(errno));
return (NULL);
}

View File

@ -15,7 +15,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 2.4.2
Release: 9%{?dist}
Release: 10%{?dist}
# the CUPS exception text is the same as LLVM exception, so using that name with
# agreement from legal team
# https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/A7GFSD6M3GYGSI32L2FC5KB22DUAEQI3/
@ -72,6 +72,7 @@ Patch100: cups-lspp.patch
#### UPSTREAM PATCHES (starts with 1000) ####
Patch1001: 0001-scheduler-ipp.c-Allocate-device_uri-via-cupsdSetStri.patch
Patch1002: cups-resolve-local.patch
Patch1003: cups-ippeveprinter-typo.patch
##### Patches removed because IMHO they aren't no longer needed
##### but still I'll leave them in git in case their removal
@ -286,6 +287,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
# UPSTREAM PATCHES
%patch1001 -p1 -b .invalid-pointer-uri
%patch1002 -p1 -b .localhost
# https://github.com/OpenPrinting/cups/pull/629
%patch1003 -p1 -b .ippeveprinter-typo
%if %{lspp}
@ -692,6 +695,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man7/ippeveps.7.gz
%changelog
* Thu Mar 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.2-10
- fix loading ippeveps in ippeveprinter if only the command name is provided
* Mon Feb 20 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.2-9
- move /etc/cups into cups-filesystem, since cups-browsed needs it