diff options
| author | Volker Lendecke <vl@samba.org> | 2011-02-07 16:59:38 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-02-28 16:40:19 +0100 |
| commit | 2b0057c2cb4f05005354008044049fc3dc2bd1fd (patch) | |
| tree | 6d0ed397c035c325c270f44a166e6b134a974cfe /source3/lib/ctdbd_conn.c | |
| parent | deb58b2e941f6d307f28f7b909f388c39fe915e8 (diff) | |
| download | samba-2b0057c2cb4f05005354008044049fc3dc2bd1fd.tar.gz samba-2b0057c2cb4f05005354008044049fc3dc2bd1fd.tar.bz2 samba-2b0057c2cb4f05005354008044049fc3dc2bd1fd.zip | |
s3: Eliminate select from packet_fd_read_sync
Diffstat (limited to 'source3/lib/ctdbd_conn.c')
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 11 |
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); } /* |