summaryrefslogtreecommitdiff
path: root/source3/lib/util_sock.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-01-31 23:26:12 +0000
committerJeremy Allison <jra@samba.org>2002-01-31 23:26:12 +0000
commit69adbb0ce3bb9d5bd569c13aaa3ac8f390c1586a (patch)
tree64a15ac400842319f5db5d2c504632a0ea5ad751 /source3/lib/util_sock.c
parent0815cd63bd878d72c154caf5e121352b2af10a53 (diff)
downloadsamba-69adbb0ce3bb9d5bd569c13aaa3ac8f390c1586a.tar.gz
samba-69adbb0ce3bb9d5bd569c13aaa3ac8f390c1586a.tar.bz2
samba-69adbb0ce3bb9d5bd569c13aaa3ac8f390c1586a.zip
Fix from Michael Steffens <michael_steffens@hp.com> to make signal
processing work correctly in winbindd. This is a really good patch that gives full select semantics to the Samba modified select. Jeremy. (This used to be commit 3af16ade173cac24c1ac5eff4a36b439f16ac036)
Diffstat (limited to 'source3/lib/util_sock.c')
-rw-r--r--source3/lib/util_sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 3d32d77000..daab7933da 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -208,7 +208,7 @@ int read_data_outstanding(int fd, unsigned int time_out)
timeout.tv_sec = (time_t) (time_out / 1000);
timeout.tv_usec = (long)(1000 * (time_out % 1000));
- selrtn = sys_select_intr(fd + 1, &fds, &timeout);
+ selrtn = sys_select_intr(fd + 1, &fds, NULL, NULL, &timeout);
if (selrtn <= 0)
{
@@ -283,7 +283,7 @@ static ssize_t read_socket_with_timeout(int fd,char *buf,size_t mincnt,size_t ma
FD_ZERO(&fds);
FD_SET(fd,&fds);
- selrtn = sys_select_intr(fd+1,&fds,&timeout);
+ selrtn = sys_select_intr(fd+1,&fds,NULL,NULL,&timeout);
/* Check if error */
if (selrtn == -1) {