From d52d3c895d2eea2d8004659768e94e4d4d1739d7 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Aug 23 2010 10:36:28 +0000 Subject: Fixed SNMP quirks parsing. --- diff --git a/cups-snmp-quirks.patch b/cups-snmp-quirks.patch index d90c5f6..0308676 100644 --- a/cups-snmp-quirks.patch +++ b/cups-snmp-quirks.patch @@ -96,8 +96,8 @@ diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp- + for (i = 0; i < sizeof (quirk_names) / sizeof (quirk_names[0]); i++) + { + len = strlen (quirk_names[i].keyword); -+ if (!strncmp (value, quirk_names[i].keyword, len) && -+ (value[len] == '\0' || value[len] == ' ')) ++ if (!strncmp (ptr, quirk_names[i].keyword, len) && ++ (ptr[len] == '\0' || ptr[len] == ' ')) + quirks |= quirk_names[i].bit; + } + diff --git a/cups.spec b/cups.spec index 640c040..42aeacc 100644 --- a/cups.spec +++ b/cups.spec @@ -571,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Mon Aug 23 2010 Tim Waugh +- Fixed SNMP quirks parsing. + * Fri Aug 20 2010 Tim Waugh 1:1.4.4-9 - Use better upstream fix for STR #3608 (bug #606909).