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

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 commit is contained in:
Michael Adam 2007-08-22 13:51:44 +00:00 committed by Gerald (Jerry) Carter
parent ddbe971030
commit 0193a49223

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)
{
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 */