From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 9 Jun 2014 18:35:32 +0000 (+0000)
Subject: The "snmp" option did not work with the network backends (STR #4422)
X-Git-Tag: v2.2b1~619
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a582409051f052c67eb2dd6de2d5ba02802dfb1;p=thirdparty%2Fcups.git

The "snmp" option did not work with the network backends (STR #4422)



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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 41b46b3bfd..11663b9d28 100644
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -1,6 +1,13 @@
 CHANGES-1.7.txt
 ---------------
 
+CHANGES IN CUPS V1.7.4
+
+	- CUPS did not compile when Avahi or mDNSResponder was not present
+	  (STR #4402, STR #4424)
+	- The "snmp" option did not work with the network backends (STR #4422)
+
+
 CHANGES IN CUPS V1.7.3
 
 	- Added Brazilian Portuguese translation (STR #4409)
@@ -19,8 +26,6 @@ CHANGES IN CUPS V1.7.3
 	  (STR #4397)
 	- The configure script incorrectly added libgcrypt as a GNU TLS
 	  dependency (STR #4399)
-	- CUPS did not compile when Avahi or mDNSResponder was not present
-	  (STR #4402)
 	- cupsGetDestMediaCount did not work for CUPS_MEDIA_FLAGS DEFAULT
 	  (STR #4414)
 	- Auto-typing of PWG Raster files did not work (STR #4417)
diff --git a/backend/ipp.c b/backend/ipp.c
index 778ab873cd..60f4df25e1 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -528,8 +528,8 @@ main(int  argc,				/* I - Number of command-line args */
          */
 
          snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        _cups_strcasecmp(value, "yes") ||
-                        _cups_strcasecmp(value, "true");
+                        !_cups_strcasecmp(value, "yes") ||
+                        !_cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "version"))
       {
diff --git a/backend/lpd.c b/backend/lpd.c
index 602a516edc..5815eef0ec 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -384,8 +384,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
          */
 
          snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        _cups_strcasecmp(value, "yes") ||
-                        _cups_strcasecmp(value, "true");
+                        !_cups_strcasecmp(value, "yes") ||
+                        !_cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "timeout"))
       {
diff --git a/backend/socket.c b/backend/socket.c
index 0c01fbfa78..d7f98d9b07 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -245,8 +245,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
          */
 
          snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        _cups_strcasecmp(value, "yes") ||
-                        _cups_strcasecmp(value, "true");
+                        !_cups_strcasecmp(value, "yes") ||
+                        !_cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "contimeout"))
       {