summaryrefslogtreecommitdiff
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
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)
-rw-r--r--source3/lib/util_sock.c15
-rw-r--r--source3/libsmb/clientgen.c2
-rw-r--r--source3/smbd/chgpasswd.c2
-rw-r--r--source3/smbd/process.c5
4 files changed, 11 insertions, 13 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index d0d321ee39..fcea5d8be6 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -913,10 +913,10 @@ ssize_t read_udp_v4_socket(int fd,
time_out = timeout in milliseconds
****************************************************************************/
-NTSTATUS read_socket_with_timeout_ntstatus(int fd, char *buf,
- size_t mincnt, size_t maxcnt,
- unsigned int time_out,
- size_t *size_ret)
+NTSTATUS read_socket_with_timeout(int fd, char *buf,
+ size_t mincnt, size_t maxcnt,
+ unsigned int time_out,
+ size_t *size_ret)
{
fd_set fds;
int selrtn;
@@ -1052,7 +1052,7 @@ ssize_t read_data(int fd,char *buffer,size_t N, enum smb_read_errors *pre)
set_smb_read_error(pre, SMB_READ_OK);
- status = read_socket_with_timeout_ntstatus(fd, buffer, N, N, 0, NULL);
+ status = read_socket_with_timeout(fd, buffer, N, N, 0, NULL);
if (NT_STATUS_IS_OK(status)) {
return N;
@@ -1138,8 +1138,7 @@ NTSTATUS read_smb_length_return_keepalive(int fd, char *inbuf,
int msg_type;
NTSTATUS status;
- status = read_socket_with_timeout_ntstatus(fd, inbuf, 4, 4, timeout,
- NULL);
+ status = read_socket_with_timeout(fd, inbuf, 4, 4, timeout, NULL);
if (!NT_STATUS_IS_OK(status)) {
return status;
@@ -1255,7 +1254,7 @@ ssize_t receive_smb_raw(int fd,
set_smb_read_error(pre, SMB_READ_OK);
- status = read_socket_with_timeout_ntstatus(
+ status = read_socket_with_timeout(
fd, buffer+4, len, len, timeout, &len);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 086c158ed2..7a7377f148 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -184,7 +184,7 @@ ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len)
set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK);
- status = read_socket_with_timeout_ntstatus(
+ status = read_socket_with_timeout(
cli->fd, buffer, len, len, cli->timeout, NULL);
if (NT_STATUS_IS_OK(status)) {
return len;
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index bd5ff1f523..e7ab60d22f 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -265,7 +265,7 @@ static int expect(int master, char *issue, char *expected)
while (True) {
NTSTATUS status;
- status = read_socket_with_timeout_ntstatus(
+ status = read_socket_with_timeout(
master, buffer + nread, 1,
sizeof(buffer) - nread - 1,
timeout, &len);
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,