summaryrefslogtreecommitdiffstats
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-15 15:38:31 +0200
committerVolker Lendecke <vl@samba.org>2010-08-17 22:44:03 +0200
commita58cea002626cee2db77ac12aa091e5b48381662 (patch)
treeab80a8eb0c62ece1ab48a75d29432d76df51473c /source3/smbd
parent1f0afe1aed5cc267c3c24322992bfcb7c82847b1 (diff)
downloadsamba-a58cea002626cee2db77ac12aa091e5b48381662.tar.gz
samba-a58cea002626cee2db77ac12aa091e5b48381662.tar.xz
samba-a58cea002626cee2db77ac12aa091e5b48381662.zip
s3: Lift smbd_server_fd() from receive_smb_raw_talloc
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 099585e7f9a..07b53a254d4 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -367,11 +367,6 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX *mem_ctx, int fd,
status = read_smb_length_return_keepalive(fd, lenbuf, timeout, &len);
if (!NT_STATUS_IS_OK(status)) {
- char addr[INET6_ADDRSTRLEN];
- DEBUG(0, ("read_smb_length_return_keepalive failed for "
- "client %s read error = %s.\n",
- get_peer_addr(fd, addr, sizeof(addr)),
- nt_errstr(status)));
return status;
}
@@ -427,6 +422,11 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx, int fd,
status = receive_smb_raw_talloc(mem_ctx, fd, buffer, timeout,
p_unread, &len);
if (!NT_STATUS_IS_OK(status)) {
+ char addr[INET6_ADDRSTRLEN];
+ DEBUG(0, ("read_smb_length_return_keepalive failed for "
+ "client %s read error = %s.\n",
+ get_peer_addr(fd, addr, sizeof(addr)),
+ nt_errstr(status)));
return status;
}