summaryrefslogtreecommitdiff
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.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index bad5285026..cfe241e644 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -331,13 +331,12 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
static NTSTATUS ctdb_packet_fd_read_sync(struct packet_context *ctx)
{
- struct timeval timeout;
- struct timeval *ptimeout;
+ int timeout = lp_ctdb_timeout();
- timeout = timeval_set(lp_ctdb_timeout(), 0);
- ptimeout = (timeout.tv_sec != 0) ? &timeout : NULL;
-
- return packet_fd_read_sync(ctx, ptimeout);
+ if (timeout == 0) {
+ timeout = -1;
+ }
+ return packet_fd_read_sync(ctx, timeout);
}
/*