--UlVJffcvxoiEqYs2
Content-Type: text/plain; charset=us-ascii

On Mon, Mar 26, 2001 at 10:13:33PM -0500, Mike Pelley wrote:
> I will make a patch soon for the 1.5 branch to fix kern/12443 and
> offer it for folks to test out.  Manuel, if you come across the patch
> you put together that would be great ;o)

He sent the patch to tech-kern on February 11th I think, here it
is.

--
Reed <aiko@antigone.net>

--UlVJffcvxoiEqYs2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: ip_ftp_pxy.c
===================================================================
RCS file: /cvsroot/syssrc/sys/netinet/ip_ftp_pxy.c,v
retrieving revision 1.16.4.1
diff -u -r1.16.4.1 ip_ftp_pxy.c
--- ip_ftp_pxy.c	2000/08/31 14:49:49	1.16.4.1
+++ ip_ftp_pxy.c	2001/02/11 16:03:58
@@ -672,15 +672,18 @@
 			while ((rptr < wptr) && (*rptr != '\r'))
 				rptr++;
 
-			if ((*rptr == '\r') && (rptr + 1 < wptr)) {
-				if (*(rptr + 1) == '\n') {
-					rptr += 2;
-					f->ftps_junk = 0;
+			if (*rptr == '\r') {
+				if (rptr + 1 < wptr) {
+					if (*(rptr + 1) == '\n') {
+						rptr += 2;
+						f->ftps_junk = 0;
+					} else
+						rptr++;
 				} else
-					rptr++;
+					break;
 			}
-			f->ftps_rptr = rptr;
 		}
+		f->ftps_rptr = rptr;
 
 		if (rptr == wptr) {
 			rptr = wptr = f->ftps_buf;

--UlVJffcvxoiEqYs2--