Fix an issue with the error handling for the network backends (Issue #4979)

diff --git a/CHANGES.txt b/CHANGES.txt
index e8ccbed7735b6aac5643c6f8bbc66ac0514f3a17..17985581c5ea55d0629d4866d10b753822290b97 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.2.3 - 2017-03-10
+CHANGES.txt - 2.2.3 - 2017-03-14
 --------------------------------
 
 CHANGES IN CUPS V2.2.3
@@ -19,6 +19,7 @@ CHANGES IN CUPS V2.2.3
          (Issue #4954)
        - The IPP Everywhere finishings support did not work correctly with
          common UI or command-line options (Issue #4976)
+        - Fixed an error handling issue for the network backends (Issue #4979)
        - The default cupsd.conf file did not work on systems compiled without
          Kerberos support (Issue #4947)
        - Fixed some localization issues on macOS (<rdar://problem/27245567>)

diff --git a/backend/runloop.c b/backend/runloop.c
index baa34627315b527f187dac8c6e0b0ce15ff4de19..13e5225261bfb09635ad2cb541ba1f3ce46530e5 100644 (file)
--- a/backend/runloop.c
+++ b/backend/runloop.c
@@ -77,7 +77,7 @@ backendDrainOutput(int print_fd,      /* I - Print file descriptor */
       * Read error - bail if we don't see EAGAIN or EINTR...
       */
 
-      if (errno != EAGAIN || errno != EINTR)
+      if (errno != EAGAIN && errno != EINTR)
       {
        fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
        _cupsLangPrintFilter(stderr, "ERROR", _("Unable to read print data."));
@@ -305,7 +305,7 @@ backendRunLoop(
         * Read error - bail if we don't see EAGAIN or EINTR...
        */
 
-       if (errno != EAGAIN || errno != EINTR)
+       if (errno != EAGAIN && errno != EINTR)
        {
          fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
          _cupsLangPrintFilter(stderr, "ERROR",