1590123 - cups-driverd doesn't recognize static gzipped ppds

This commit is contained in:
Zdenek Dohnal 2018-06-12 15:33:34 +02:00
parent 370473678b
commit 0733cdc407
2 changed files with 3 additions and 18 deletions

View File

@ -91,21 +91,3 @@ diff -up cups-2.2.6/scheduler/log.c.journal-history cups-2.2.6/scheduler/log.c
else
return (1);
}
@@ -989,7 +980,7 @@ cupsdLogPage(cupsd_job_t *job, /* I - J
*bufptr = '\0';
#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
- if (!strcmp(ErrorLog, "syslog"))
+ if (!strcmp(PageLog, "syslog"))
{
static const char * const job_states[] =
{ /* job-state strings */
@@ -1186,7 +1177,7 @@ cupsdLogRequest(cupsd_client_t *con, /*
}
#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
- if (!strcmp(ErrorLog, "syslog"))
+ if (!strcmp(AccessLog, "syslog"))
{
sd_journal_print(LOG_INFO, "REQUEST %s - %s \"%s %s HTTP/%d.%d\" %d " CUPS_LLFMT " %s %s", con->http->hostname, con->username[0] != '\0' ? con->username : "-", states[con->operation], _httpEncodeURI(temp, con->uri, sizeof(temp)), con->http->version / 100, con->http->version % 100, code, CUPS_LLCAST con->bytes, con->request ? ippOpString(con->request->request.op.operation_id) : "-", con->response ? ippErrorString(con->response->request.status.status_code) : "-");
return (1);

View File

@ -86,6 +86,8 @@ BuildRequires: systemd
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: automake
# needed for decompressing functions when reading from gzipped ppds
BuildRequires: zlib-devel
# gcc and gcc-c++ is no longer in buildroot by default
# gcc for most of files
@ -664,6 +666,7 @@ rm -f %{cups_serverbin}/backend/smb
%changelog
* Tue Jun 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.7-2
- 1589593 - cupsd LogLevel ignored when logging to journald (syslog)
- 1590123 - cups-driverd doesn't recognize static gzipped ppds
* Tue Apr 03 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.7-1
- rebase to 2.2.7