## Automatically generated incremental diff
## From:   linux-2.2.15-pre19
## To:     linux-2.2.15
## Robot:  $Id: make-incremental-diff,v 1.7 2001/12/04 05:19:54 hpa Exp $

diff -urN linux-2.2.15-pre19/Makefile linux/Makefile
--- linux-2.2.15-pre19/Makefile	Mon Dec  3 22:02:52 2001
+++ linux/Makefile	Mon Dec  3 22:02:59 2001
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 15
-EXTRAVERSION = pre19
+EXTRAVERSION = 
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.15-pre19/drivers/char/pty.c linux/drivers/char/pty.c
--- linux-2.2.15-pre19/drivers/char/pty.c	Mon Dec  3 22:02:52 2001
+++ linux/drivers/char/pty.c	Mon Dec  3 22:02:59 2001
@@ -121,6 +121,7 @@
 	    o_tty->ldisc.write_wakeup)
 		(o_tty->ldisc.write_wakeup)(o_tty);
 	wake_up_interruptible(&o_tty->write_wait);
+	wake_up_interruptible(&o_tty->poll_wait);
 	set_bit(TTY_THROTTLED, &tty->flags);
 }
 
diff -urN linux-2.2.15-pre19/init/main.c linux/init/main.c
--- linux-2.2.15-pre19/init/main.c	Mon Dec  3 22:02:54 2001
+++ linux/init/main.c	Mon Dec  3 22:03:00 2001
@@ -156,9 +156,6 @@
 #ifdef CONFIG_IUCV
 extern void iucv_setup(char *str, int *ints);
 #endif
-#ifdef CONFIG_IUCV
-extern void iucv_setup(char *str, int *ints);
-#endif
 #ifdef CONFIG_ARCNET_COM90xxIO
 extern void com90io_setup(char *str, int *ints);
 #endif
@@ -656,10 +653,6 @@
 	{ "noapic", ioapic_setup },
 	{ "pirq=", ioapic_pirq_setup },
 #endif
-#ifdef CONFIG_IUCV
-        { "iucv=", iucv_setup } ,
-#endif
-
 #endif
 #ifdef CONFIG_BLK_DEV_RAM
 	{ "ramdisk_start=", ramdisk_start_setup },
diff -urN linux-2.2.15-pre19/net/ipv4/Config.in linux/net/ipv4/Config.in
--- linux-2.2.15-pre19/net/ipv4/Config.in	Mon Dec  3 22:02:54 2001
+++ linux/net/ipv4/Config.in	Tue Oct 26 17:53:42 1999
@@ -41,7 +41,6 @@
     bool 'IP: masquerading' CONFIG_IP_MASQUERADE
     if [ "$CONFIG_IP_MASQUERADE" != "n" ]; then
       comment 'Protocol-specific masquerading support will be built as modules.'
-      bool 'IP: UDP masquerading loose checking' CONFIG_IP_MASQUERADE_UDP_LOOSE
       bool 'IP: ICMP masquerading' CONFIG_IP_MASQUERADE_ICMP
       comment 'Protocol-specific masquerading support will be built as modules.'
       if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
diff -urN linux-2.2.15-pre19/net/sunrpc/svcauth.c linux/net/sunrpc/svcauth.c
--- linux-2.2.15-pre19/net/sunrpc/svcauth.c	Mon Apr  7 11:35:33 1997
+++ linux/net/sunrpc/svcauth.c	Mon Dec  3 22:03:00 2001
@@ -4,6 +4,9 @@
  * The generic interface for RPC authentication on the server side.
  * 
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
+ *
+ * CHANGES
+ * 19-Apr-2000 Chris Evans      - Security fix
  */
 
 #include <linux/types.h>
@@ -117,7 +120,8 @@
 	struct svc_buf	*resp = &rqstp->rq_resbuf;
 	struct svc_cred	*cred = &rqstp->rq_cred;
 	u32		*bufp = argp->buf;
-	int		len   = argp->len, slen, i;
+	int		len   = argp->len;
+	u32		slen, i;
 
 	if ((len -= 3) < 0) {
 		*statp = rpc_garbage_args;
@@ -127,7 +131,7 @@
 	bufp++;					/* length */
 	bufp++;					/* time stamp */
 	slen = (ntohl(*bufp++) + 3) >> 2;	/* machname length */
-	if (slen > 64 || (len -= slen) < 0)
+	if (slen > 64 || (len -= slen + 3) < 0)
 		goto badcred;
 	bufp += slen;				/* skip machname */
 
