4345. [contrib] perftcpdns mishandled the return values from

                        clock_nanosleep. [RT #42131]

(cherry picked from commit 8fcf2413e99597b6690b6a352aa12842f9be27e5)

diff --git a/CHANGES b/CHANGES
index 4a5762736a1af99fe1568002a5f96149a7a69887..f4bb1e9124a853b223687b00b05521272d34f376 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4345.  [contrib]       perftcpdns mishandled the return values from
+                       clock_nanosleep. [RT #42131]
+
 4344.  [port]          Address openssl version differences. [RT #42059]
 
        --- 9.10.4b3 released ---

diff --git a/contrib/perftcpdns/perftcpdns.c b/contrib/perftcpdns/perftcpdns.c
index f545b5c6686286fc9187849f84ce0e8286de897d..2af04e3cf12ec213ed0890a777d1a1eaaf2e574e 100644 (file)
--- a/contrib/perftcpdns/perftcpdns.c
+++ b/contrib/perftcpdns/perftcpdns.c
@@ -1354,10 +1354,11 @@ connecting(void *dummy)
                } else {
                        /* wait until */
                        ret = clock_nanosleep(CLOCK_REALTIME, 0, &ts, NULL);
-                       if (ret < 0) {
-                               if (errno == EINTR)
+                       if (ret != 0) {
+                               if (ret == EINTR)
                                        continue;
-                               perror("clock_nanosleep");
+                               fprintf(stderr, "clock_nanosleep: %s\n",
+                                       strerror(ret));
                                fatal = 1;
                                (void) pthread_kill(master, SIGTERM);
                                break;