summaryrefslogtreecommitdiff
path: root/source3/smbd/process.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-25 23:43:50 +0100
committerVolker Lendecke <vl@samba.org>2008-02-02 11:03:22 +0100
commit6ddfa6ae7734ffdd26ac38478c27cc9d646ddadd (patch)
treea805fa8be7c56c5d6f163c53875e42020c9ffff5 /source3/smbd/process.c
parent5e43eeb1b6eef7ea7a88ffc51a0a0535e9bd8023 (diff)
downloadsamba-6ddfa6ae7734ffdd26ac38478c27cc9d646ddadd.tar.gz
samba-6ddfa6ae7734ffdd26ac38478c27cc9d646ddadd.tar.bz2
samba-6ddfa6ae7734ffdd26ac38478c27cc9d646ddadd.zip
read_socket_with_timeout_ntstatus->read_socket_with_timeout
(This used to be commit 90554799afa42855c3e7b87dc632e67f0952f988)
Diffstat (limited to 'source3/smbd/process.c')
-rw-r--r--source3/smbd/process.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index e21229109d..83e51e3892 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -141,8 +141,7 @@ static NTSTATUS read_packet_remainder(int fd, char *buffer,
return NT_STATUS_OK;
}
- return read_socket_with_timeout_ntstatus(fd, buffer, len, len,
- timeout, NULL);
+ return read_socket_with_timeout(fd, buffer, len, len, timeout, NULL);
}
/****************************************************************************
@@ -176,7 +175,7 @@ static NTSTATUS receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
memcpy(writeX_header, lenbuf, sizeof(lenbuf));
- status = read_socket_with_timeout_ntstatus(
+ status = read_socket_with_timeout(
fd, writeX_header + 4,
STANDARD_WRITE_AND_X_HEADER_SIZE,
STANDARD_WRITE_AND_X_HEADER_SIZE,