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 f78b0bbf5c6d74207781da2f46901fecafd6122e..38fc1b31614f93e9957b7422965cf128ecd6acf7 100644 (file)
--- 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 7e2142a0bee66450d167c00515027975d4a47db8..3f2869d6bce7650e50fc629ea83095d942685f11 100644 (file)
--- 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)