rpms/cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f20' into f21

Browse Source
This commit is contained in:
Tim Waugh 2014-08-14 13:25:16 +01:00
commit 4d7f8aec82
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cups-str4461.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up cups-1.7.4/scheduler/client.c.str4461 cups-1.7.4/scheduler/client.c
--- cups-1.7.4/scheduler/client.c.str4461 2014-08-11 16:30:04.695889827 +0100
+++ cups-1.7.4/scheduler/client.c 2014-08-11 16:30:04.697889838 +0100
@@ -3360,8 +3360,18 @@ get_file(cupsd_client_t *con, /* I - C
if (!status && !(filestats->st_mode & S_IROTH))
{
- cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Files/directories such as \"%s\" must be world-readable.", con->http.fd, filename);
- return (NULL);
+ /*
+ * The exception is for cupsd.conf and log files for
+ * authenticated access.
+ */
+
+ if ((strcmp(con->uri, "/admin/conf/cupsd.conf") &&
+ strncmp(con->uri, "/admin/log/", 11)) ||
+ cupsdIsAuthorized(con, NULL) != HTTP_OK)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Files/directories such as \"%s\" must be world-readable.", con->http.fd, filename);
+ return (NULL);
+ }
}
/*

8
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.5 Version: 1.7.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -65,6 +65,7 @@ Patch36: cups-web-devices-timeout.patch
Patch37: cups-final-content-type.patch Patch37: cups-final-content-type.patch
Patch38: cups-journal.patch Patch38: cups-journal.patch
Patch39: cups-synconclose.patch Patch39: cups-synconclose.patch
Patch40: cups-str4461.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -264,6 +265,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch38 -p1 -b .journal %patch38 -p1 -b .journal
# Set the default for SyncOnClose to Yes. # Set the default for SyncOnClose to Yes.
%patch39 -p1 -b .synconclose %patch39 -p1 -b .synconclose
# Fix conf/log file reading for authenticated users (STR #4461).
%patch40 -p1 -b .str4461
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -671,6 +674,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Mon Aug 11 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.5-2
- Fix conf/log file reading for authenticated users (STR #4461).
* Fri Aug 01 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.5-1 * Fri Aug 01 2014 Jiri Popelka <jpopelka@redhat.com> - 1:1.7.5-1
- 1.7.5 - 1.7.5