[cups] cups-dbus-utf.patch: no need to validate job-name name.
Tim Waugh
twaugh at fedoraproject.org
Wed Apr 10 10:40:40 UTC 2013
commit aee5018577553f5c335f422a5a0c4d6bb54e5db0
Author: Tim Waugh <twaugh at redhat.com>
Date: Wed Apr 10 11:26:11 2013 +0100
cups-dbus-utf.patch: no need to validate job-name name.
cups-dbus-utf8.patch | 9 ---------
cups.spec | 5 +++++
2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/cups-dbus-utf8.patch b/cups-dbus-utf8.patch
index e9a2fba..0bcd4a1 100644
--- a/cups-dbus-utf8.patch
+++ b/cups-dbus-utf8.patch
@@ -104,12 +104,3 @@ diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
if (!dbus_message_iter_append_string(&iter, &val))
goto bail;
}
-@@ -530,7 +605,7 @@ main(int argc, /* I - Number of comm
- attr = ippFindAttribute(msg, "job-name", IPP_TAG_NAME);
- if (attr)
- {
-- const char *val = ippGetString(attr, 0, NULL);
-+ const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
- if (!dbus_message_iter_append_string(&iter, &val))
- goto bail;
- }
diff --git a/cups.spec b/cups.spec
index 1b27fc9..a517aba 100644
--- a/cups.spec
+++ b/cups.spec
@@ -621,6 +621,11 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
+* Wed Apr 10 2013 Tim Waugh <twaugh at redhat.com>
+- cups-dbus-utf.patch: now that the scheduler only accepts valid UTF-8
+ strings for job-name, there's no need to validate it as UTF-8 in the
+ dbus notifier.
+
* Thu Apr 4 2013 Tim Waugh <twaugh at redhat.com> 1:1.6.1-4
- Use IP address when resolving DNSSD URIs (bug #948288).
More information about the scm-commits
mailing list