[exim-cvs] Fix merge problem.

Commit:     ae96393855f6ea395a53a1767cc049d1f6ae9683
Parent:     1ac6b2e7857d7b6645dbd09047c4c2ac3b6cef1d
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Nov 23 01:33:31 2012 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Nov 23 01:33:31 2012 +0000

    Fix merge problem.
---
 src/src/queue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/src/queue.c b/src/src/queue.c
index ff0ae67..8876e09 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -650,7 +650,7 @@ for (i  = (queue_run_in_order? -1 : 0);
     the mere fact that read() unblocks is enough. */

     set_process_info("running queue: waiting for children of %d", pid);
-    if (read(pfd[pipe_read], buffer, sizeof(buffer)) >= 0)
+    if (read(pfd[pipe_read], buffer, sizeof(buffer)) > 0)
       log_write(0, LOG_MAIN|LOG_PANIC, "queue run: unexpected data on pipe");
     (void)close(pfd[pipe_read]);
     set_process_info("running queue");