diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-03-18 21:49:50 +0000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-15 09:07:24 +0200 |
| commit | b0eea09ab6590daedb90692af5c74115172d22a1 (patch) | |
| tree | 2179fcf2855498e76b6679ef7c6093dcd7f38242 /source3/modules | |
| parent | 9d60568ebb2ef7abf04eb17bc769296542f12bb7 (diff) | |
| download | samba-b0eea09ab6590daedb90692af5c74115172d22a1.tar.gz | |
s3 onefs: Correctly error out when the read returns EOF
Also add some more debugging.
(cherry picked from commit a398deb3fe71a6c4c237b1f64dd7bbb8cb6bfa28)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_system.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c index b8b059bce95..46f38265b16 100644 --- a/source3/modules/onefs_system.c +++ b/source3/modules/onefs_system.c @@ -591,8 +591,8 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T offset, */ while (total_rbytes < count) { - DEBUG(0, ("shallow recvfile, reading %llu\n", - count - total_rbytes)); + DEBUG(0, ("shallow recvfile (%s), reading %llu\n", + strerror(errno), count - total_rbytes)); /* * Read the remaining data into the spill buffer. recvfile @@ -603,9 +603,13 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T offset, spill_buffer + (total_rbytes - total_wbytes), count - total_rbytes); - if (ret == -1) { - DEBUG(0, ("shallow recvfile read failed: %s\n", - strerror(errno))); + if (ret <= 0) { + if (ret == 0) { + DEBUG(0, ("shallow recvfile read: EOF\n")); + } else { + DEBUG(0, ("shallow recvfile read failed: %s\n", + strerror(errno))); + } /* Socket is dead, so treat as if it were drained. */ socket_drained = true; goto out; |