diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-25 23:43:50 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-02-02 11:03:22 +0100 |
| commit | 6ddfa6ae7734ffdd26ac38478c27cc9d646ddadd (patch) | |
| tree | a805fa8be7c56c5d6f163c53875e42020c9ffff5 /source3/smbd | |
| parent | 5e43eeb1b6eef7ea7a88ffc51a0a0535e9bd8023 (diff) | |
| download | samba-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')
| -rw-r--r-- | source3/smbd/chgpasswd.c | 2 | ||||
| -rw-r--r-- | source3/smbd/process.c | 5 |
2 files changed, 3 insertions, 4 deletions
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, |