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 41b46b3bfd7bc6c2802bbbefde518511725bc568..11663b9d289bbf56064c8503ed012f257bff8574 100644 (file)
--- 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 778ab873cdfd62cf88c46b9ada876ceb62b8e56a..60f4df25e1da084a61d89db464a37c0d34bf8832 100644 (file)
--- 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 602a516edc599033de1b777dd37aa627de163c74..5815eef0ecb57539c6378a8559fa5ddd99e404cb 100644 (file)
--- 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 0c01fbfa78e64f4faca860b332361100f83bd1c0..d7f98d9b07872c4cc9d39334e957b5036fb3f9d6 100644 (file)
--- 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"))
       {