components/cups/patches/str3809.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 05 Oct 2016 01:21:05 -0700
branchs11u3-sru
changeset 7090 49c102d793d0
parent 3535 a05569ec203e
permissions -rw-r--r--
24698806 Upgrade Thunderbird to version 45.3.0 24802000 problem in TBIRD/MAILER
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3535
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     1
See: http://www.cups.org/str.php?L3809 for details.
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     2
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     3
Index: backend/snmp-supplies.c
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     4
===================================================================
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     5
--- backend/snmp-supplies.c
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     6
+++ backend/snmp-supplies.c
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     7
@@ -373,9 +373,9 @@
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     8
   * See if we should be getting supply levels via SNMP...
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     9
   */
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    10
 
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    11
-  if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL &&
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    12
-      (ppdattr = ppdFindAttr(ppd, "cupsSNMPSupplies", NULL)) != NULL &&
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    13
-      ppdattr->value && strcasecmp(ppdattr->value, "true"))
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    14
+  if ((ppd = ppdOpenFile(getenv("PPD"))) == NULL ||
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    15
+      ((ppdattr = ppdFindAttr(ppd, "cupsSNMPSupplies", NULL)) != NULL &&
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    16
+       ppdattr->value && strcasecmp(ppdattr->value, "true")))
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    17
   {
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    18
     ppdClose(ppd);
a05569ec203e 19292724 printing to a raw queue is delayed by 4 seconds
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    19
     return;