From 3f369313bfd5c06b4a32f7304a49209b4c91de10 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 13 Sep 2017 13:48:02 +0000 Subject: bugfix: spurious error message in s6-tcpserver?d when maxed connections --- src/conn-tools/s6-tcpserver6d.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/conn-tools/s6-tcpserver6d.c') diff --git a/src/conn-tools/s6-tcpserver6d.c b/src/conn-tools/s6-tcpserver6d.c index 85128e8..5a763b5 100644 --- a/src/conn-tools/s6-tcpserver6d.c +++ b/src/conn-tools/s6-tcpserver6d.c @@ -349,12 +349,13 @@ int main (int argc, char const *const *argv, char const *const *envp) while (cont) { - if (iopause_g(x, 1 + (numconn < maxconn), 0) < 0) + int h = numconn < maxconn ; + if (iopause_g(x, 1 + h, 0) < 0) strerr_diefu1sys(111, "iopause") ; if (x[0].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with selfpipe") ; if (x[0].revents & IOPAUSE_READ) handle_signals() ; - if (numconn < maxconn) + if (h) { if (x[1].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with socket") ; if (x[1].revents & IOPAUSE_READ) -- cgit v1.2.3