Back out previous for now. I already suspected part of it was wrong,

and there has been one report of problems in the mean time.
This commit is contained in:
fvdl 2003-05-19 09:26:15 +00:00
parent cd2d76d833
commit b2a54b691e
1 changed files with 14 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: xdr_rec.c,v 1.22 2003/05/18 23:59:28 christos Exp $ */
/* $NetBSD: xdr_rec.c,v 1.23 2003/05/19 09:26:15 fvdl Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@ -35,7 +35,7 @@
static char *sccsid = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC";
#else
__RCSID("$NetBSD: xdr_rec.c,v 1.22 2003/05/18 23:59:28 christos Exp $");
__RCSID("$NetBSD: xdr_rec.c,v 1.23 2003/05/19 09:26:15 fvdl Exp $");
#endif
#endif
@ -467,6 +467,18 @@ xdrrec_skiprecord(xdrs)
RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
enum xprt_stat xstat;
if (rstrm->nonblock) {
if (__xdrrec_getrec(xdrs, &xstat, FALSE)) {
rstrm->fbtbc = 0;
return TRUE;
}
if (rstrm->in_finger == rstrm->in_boundry &&
xstat == XPRT_MOREREQS) {
rstrm->fbtbc = 0;
return TRUE;
}
return FALSE;
}
while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
if (! skip_input_bytes(rstrm, rstrm->fbtbc))
return (FALSE);
@ -615,7 +627,6 @@ __xdrrec_getrec(xdrs, statp, expectdata)
}
}
rstrm->in_reclen = rstrm->in_received = 0;
*statp = XPRT_MOREREQS;
return FALSE;
}