diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-15 15:40:08 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-17 22:44:03 +0200 |
| commit | e65197e56f86fd523516fc3ef577e72877cfab22 (patch) | |
| tree | 83d7dfd82f972a69c668f9171fc2bf090eb0810d /source3 | |
| parent | a58cea002626cee2db77ac12aa091e5b48381662 (diff) | |
| download | samba-e65197e56f86fd523516fc3ef577e72877cfab22.tar.gz samba-e65197e56f86fd523516fc3ef577e72877cfab22.tar.bz2 samba-e65197e56f86fd523516fc3ef577e72877cfab22.zip | |
s3: Remove smbd_server_fd from receive_smb_raw
This is only called from client code
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/util_sock.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 9950a416f5..756ce96abc 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -727,18 +727,8 @@ NTSTATUS receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeo status = read_smb_length_return_keepalive(fd,buffer,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))); - } + DEBUG(0, ("read_fd_with_timeout failed, read " + "error = %s.\n", nt_errstr(status))); return status; } @@ -757,19 +747,8 @@ NTSTATUS receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeo fd, buffer+4, len, len, 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))); - } + DEBUG(0, ("read_fd_with_timeout failed, read error = " + "%s.\n", nt_errstr(status))); return status; } |