diff options
| author | Michael Adam <obnox@samba.org> | 2007-08-22 13:51:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:11 -0500 |
| commit | a718a93d702d2f83e4a731c429eee24d119fe528 (patch) | |
| tree | b4fa15c1a63f2206e3f1ad61cb57b661d9ba4a19 | |
| parent | 3b29c9cbede001ed0f228ad4738ee4f6604fd367 (diff) | |
| download | samba-a718a93d702d2f83e4a731c429eee24d119fe528.tar.gz samba-a718a93d702d2f83e4a731c429eee24d119fe528.tar.bz2 samba-a718a93d702d2f83e4a731c429eee24d119fe528.zip | |
r24629: Make read_sock return the total number of bytes read instead
of the number of bytes read in the last of possibly several
read calls.
This was noted by Metze.
Michael
(This used to be commit 0193a49223c6314e2834c89fff9920ae7edc4f8a)
| -rw-r--r-- | source3/nsswitch/wb_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c index 52913668e5..5072b81515 100644 --- a/source3/nsswitch/wb_common.c +++ b/source3/nsswitch/wb_common.c @@ -420,7 +420,7 @@ int write_sock(void *buffer, int count, int recursing, int need_priv) static int read_sock(void *buffer, int count) { - int result = 0, nread = 0; + int nread = 0; int total_time = 0, selret; if (winbindd_fd == -1) { @@ -461,7 +461,7 @@ static int read_sock(void *buffer, int count) /* Do the Read */ - result = read(winbindd_fd, (char *)buffer + nread, + int result = read(winbindd_fd, (char *)buffer + nread, count - nread); if ((result == -1) || (result == 0)) { @@ -479,7 +479,7 @@ static int read_sock(void *buffer, int count) } } - return result; + return nread; } /* Read reply */ |