summaryrefslogtreecommitdiffstats
path: root/source3/lib/ctdbd_conn.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib/ctdbd_conn.c')
-rw-r--r--source3/lib/ctdbd_conn.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 29482a0e79..3e5e838bd6 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -324,15 +324,17 @@ static NTSTATUS ctdb_read_packet(int fd, TALLOC_CTX *mem_ctx,
timeout = -1;
}
- ret = poll_one_fd(fd, POLLIN, timeout, &revents);
- if (ret == -1) {
- return map_nt_error_from_unix(errno);
- }
- if (ret == 0) {
- return NT_STATUS_IO_TIMEOUT;
- }
- if (ret != 1) {
- return NT_STATUS_UNEXPECTED_IO_ERROR;
+ if (timeout != -1) {
+ ret = poll_one_fd(fd, POLLIN, timeout, &revents);
+ if (ret == -1) {
+ return map_nt_error_from_unix(errno);
+ }
+ if (ret == 0) {
+ return NT_STATUS_IO_TIMEOUT;
+ }
+ if (ret != 1) {
+ return NT_STATUS_UNEXPECTED_IO_ERROR;
+ }
}
status = read_data(fd, (char *)&msglen, sizeof(msglen));