From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 21 Oct 2014 13:42:04 +0000 (+0000)
Subject: Stop reporting waste-receptacle-xxx from SNMP, because vendors implement it
X-Git-Tag: v2.2b1~453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf766888c7c5968be0e8ed6fc45bf4ecff30815e;p=thirdparty%2Fcups.git

Stop reporting waste-receptacle-xxx from SNMP, because vendors implement it
inconsistently (STR #4499)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12227 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index f78b0bbf5c..38fc1b3161 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -16,6 +16,8 @@ CHANGES IN CUPS V2.0.1
 	- Added systemd support for cups-lpd (STR #4493)
 	- The scheduler did not honor the FatalErrors directive for mis-
 	  configured Group and SystemGroup values (STR #4495)
+	- The network backends no longer report waste-receptacle conditions when
+	  using SNMP (STR #4499)
 	- RPMs did not build (STR #4490)
 
 
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 7e2142a0be..3f2869d6bc 100644
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -297,6 +297,7 @@ backendSNMPSupplies(
               else
                 new_supply_state |= CUPS_OPC_NEAR_EOL;
               break;
+#if 0 /* Because no two vendors report waste containers the same, disable SNMP reporting of same */
           case CUPS_TC_wasteInk :
           case CUPS_TC_wastePaper :
           case CUPS_TC_wasteToner :
@@ -307,6 +308,7 @@ backendSNMPSupplies(
               else
                 new_supply_state |= CUPS_WASTE_ALMOST_FULL;
               break;
+#endif /* 0 */
           case CUPS_TC_cleanerUnit :
           case CUPS_TC_fuserCleaningPad :
               if (percent <= 1)