lib: Use poll_intr_one_fd in ctdb_read_packet
authorVolker Lendecke <vl@samba.org>
Sat, 3 Oct 2015 05:33:12 +0000 (22:33 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 7 Oct 2015 21:54:06 +0000 (23:54 +0200)
This is an actual bug fix if someone sets "ctdb timeout" to something != 0

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/lib/ctdbd_conn.c

index 990819e089aa9cd36b9c72a166e3b2e378b13297..9e598ac4d0b5e0123d1cb71510d9a5cc1b0c5d21 100644 (file)
@@ -301,7 +301,7 @@ static int ctdb_read_packet(int fd, int timeout, TALLOC_CTX *mem_ctx,
        ssize_t nread;
 
        if (timeout != -1) {
-               ret = poll_one_fd(fd, POLLIN, timeout, &revents);
+               ret = poll_intr_one_fd(fd, POLLIN, timeout, &revents);
                if (ret == -1) {
                        return errno;
                }