summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-15 15:46:29 +0200
committerVolker Lendecke <vl@samba.org>2010-08-17 22:44:04 +0200
commitf8ecec21e2c4451fe892885cfc12afa98a8c14f6 (patch)
tree30fdfded211564cffb752747ee5b61ebebaec84d /source3
parent840b0f523b978aa6cb9acbac26023a756afcea81 (diff)
downloadsamba-f8ecec21e2c4451fe892885cfc12afa98a8c14f6.tar.gz
samba-f8ecec21e2c4451fe892885cfc12afa98a8c14f6.tar.bz2
samba-f8ecec21e2c4451fe892885cfc12afa98a8c14f6.zip
s3: Remove smbd_server_fd() from read_smb_length()
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 437d4d86dc..97269df7c1 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3814,18 +3814,13 @@ static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout,
status = read_smb_length_return_keepalive(fd, inbuf, timeout,
len);
if (!NT_STATUS_IS_OK(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)));
- }
+ 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)));
return status;
}