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

Use string literal for format string in sd_journal_print call.

Browse Source
This commit is contained in:
Tim Waugh 2013-12-13 15:21:08 +00:00
parent 877241921a
commit 618d1c8838
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups-journal.patch
View File

@ -473,7 +473,7 @@ diff -up cups-1.7.0/scheduler/log.c.journal cups-1.7.0/scheduler/log.c
+ "CUPS_JOB_ID=%d", job->id, + "CUPS_JOB_ID=%d", job->id,
+ NULL) ? 0 : 1); + NULL) ? 0 : 1);
+ } else + } else
+ return (sd_journal_print (syslevels[level], message) ? 0 : 1); + return (sd_journal_print (syslevels[level], "%s", message) ? 0 : 1);
+ } + }
+#endif /* HAVE_JOURNAL */ +#endif /* HAVE_JOURNAL */
#ifdef HAVE_VSYSLOG #ifdef HAVE_VSYSLOG

5
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.0 Version: 1.7.0
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -658,6 +658,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Fri Dec 13 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-8
- Use string literal for format string in sd_journal_print call.
* Thu Nov 28 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-7 * Thu Nov 28 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-7
- Prevent USB timeouts causing incorrect print output (bug #1026914). - Prevent USB timeouts causing incorrect print output (bug #1026914).