summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util_sock.c20
-rw-r--r--source3/smbd/reply.c11
2 files changed, 9 insertions, 22 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index b61a3f703e..74a3e343ac 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -531,25 +531,7 @@ NTSTATUS read_fd_with_timeout(int fd, char *buf,
NTSTATUS read_data(int fd, char *buffer, size_t N)
{
- NTSTATUS status;
-
- status = read_fd_with_timeout(fd, buffer, N, N, 0, NULL);
- if (NT_STATUS_IS_OK(status)) {
- return status;
- }
- if (fd == smbd_server_fd()) {
- char addr[INET6_ADDRSTRLEN];
- /* Try and give an error message
- * saying what client failed. */
- DEBUG(0, ("read_fd_with_timeout failed for "
- "client %s read error = %s.\n",
- get_peer_addr(fd,addr,sizeof(addr)),
- nt_errstr(status)));
- } else {
- DEBUG(0, ("read_fd_with_timeout failed, read error = %s.\n",
- nt_errstr(status)));
- }
- return status;
+ return read_fd_with_timeout(fd, buffer, N, N, 0, NULL);
}
/****************************************************************************
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a2b6b33af5..18d198fe0f 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3966,9 +3966,14 @@ void reply_writebraw(struct smb_request *req)
status = read_data(req->sconn->sock, buf+4, numtowrite);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("reply_writebraw: Oversize secondary write "
- "raw read failed (%s). Terminating\n",
- nt_errstr(status)));
+ char addr[INET6_ADDRSTRLEN];
+ /* Try and give an error message
+ * saying what client failed. */
+ DEBUG(0, ("reply_writebraw: Oversize secondary write "
+ "raw read failed (%s) for client %s. "
+ "Terminating\n", nt_errstr(status),
+ get_peer_addr(req->sconn->sock, addr,
+ sizeof(addr))));
exit_server_cleanly("secondary writebraw failed");
}