sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r24629: Make read_sock return the total number of bytes read instead

Browse Source 
of the number of bytes read in the last of possibly several
read calls.

This was noted by Metze.

Michael
This commit is contained in:
Michael Adam 2007-08-22 13:51:44 +00:00 committed by Gerald (Jerry) Carter
parent ddbe971030
commit 0193a49223
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/nsswitch/wb_common.c
View File

@ -420,7 +420,7 @@ int write_sock(void *buffer, int count, int recursing, int need_priv)
static int read_sock(void *buffer, int count) static int read_sock(void *buffer, int count)
{ {
int result = 0, nread = 0; int nread = 0;
int total_time = 0, selret; int total_time = 0, selret;
if (winbindd_fd == -1) { if (winbindd_fd == -1) {
@ -461,7 +461,7 @@ static int read_sock(void *buffer, int count)
/* Do the Read */ /* Do the Read */
result = read(winbindd_fd, (char *)buffer + nread, int result = read(winbindd_fd, (char *)buffer + nread,
count - nread); count - nread);
if ((result == -1) || (result == 0)) { if ((result == -1) || (result == 0)) {
@ -479,7 +479,7 @@ static int read_sock(void *buffer, int count)
} }
} }
return result; return nread;
} }
/* Read reply */ /* Read reply */