Fixed a bug in the CUPS_SC_GET_DEVICE_ID handling by the network backends

(STR #4447)

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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 4d06a687b5b67f4a39e47be8461cc4fee6ad6d92..fab0ecdee09f1d85bca0dc06609804b6fb0a42a0 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -17,6 +17,8 @@ CHANGES IN CUPS V1.7.4
        - Fixed the --disable-libusb configure option (STR #4439)
        - Fixed the debug output from the DNS-SD backend when using Avahi
          (STR #4444)
+       - Fixed a bug in the CUPS_SC_GET_DEVICE_ID handling by the network
+         backends (STR #4447)
 
 
 CHANGES IN CUPS V1.7.3

diff --git a/backend/network.c b/backend/network.c
index a09a45dcfedc04df47326c4f66cb8a8c4045723b..62be7f399e6c82930cc1f1ad2908c84553f3759d 100644 (file)
--- a/backend/network.c
+++ b/backend/network.c
@@ -250,6 +250,12 @@ backendNetworkSideCB(
        datalen = 0;
        break;
 
+    case CUPS_SC_CMD_GET_CONNECTED :
+       status  = CUPS_SC_STATUS_OK;
+        data[0] = device_fd != -1;
+        datalen = 1;
+        break;
+
     case CUPS_SC_CMD_GET_DEVICE_ID :
         if (snmp_fd >= 0)
        {
@@ -287,12 +293,6 @@ backendNetworkSideCB(
          break;
        }
 
-    case CUPS_SC_CMD_GET_CONNECTED :
-       status  = CUPS_SC_STATUS_OK;
-        data[0] = device_fd != -1;
-        datalen = 1;
-        break;
-
     default :
         status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
        datalen = 0;