From bd62245173846f1ca0482d9378c05ad7a3625860 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@fedoraproject.org>
Date: Thu, 7 Oct 2004 13:07:16 +0000
Subject: [PATCH] - Fix use of 'demand' without explicit MTU/MRU with pppoatm

---
 ppp-2.4.2-pppoatm-mtu.patch | 28 ++++++++++++++++++++++++++++
 ppp.spec                    | 13 +++++++++----
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 ppp-2.4.2-pppoatm-mtu.patch

diff --git a/ppp-2.4.2-pppoatm-mtu.patch b/ppp-2.4.2-pppoatm-mtu.patch
new file mode 100644
index 0000000..085f398
--- /dev/null
+++ b/ppp-2.4.2-pppoatm-mtu.patch
@@ -0,0 +1,28 @@
+--- ppp-2.4.2/pppd/plugins/pppoatm/pppoatm.c.mtu	2004-10-07 13:32:05.660910432 +0100
++++ ppp-2.4.2/pppd/plugins/pppoatm/pppoatm.c	2004-10-07 13:58:20.096559832 +0100
+@@ -175,8 +175,10 @@
+ {
+ 	int sock;
+ 	struct ifreq ifr;
+-	if (mtu > pppoatm_max_mtu)
+-		error("Couldn't increase MTU to %d", mtu);
++	if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) {
++		warn("Couldn't increase MTU to %d. Using %d", mtu, pppoatm_max_mtu);
++		mtu = pppoatm_max_mtu;
++	}
+ 	sock = socket(AF_INET, SOCK_DGRAM, 0);
+ 	if (sock < 0)
+ 		fatal("Couldn't create IP socket: %m");
+@@ -192,8 +194,10 @@
+ 			      int pcomp,
+ 			      int accomp)
+ {
+-	if (mru > pppoatm_max_mru)
+-		error("Couldn't increase MRU to %d", mru);
++	if (pppoatm_max_mru && mru > pppoatm_max_mru) {
++		warn("Couldn't increase MRU to %d. Using %d", mru, pppoatm_max_mru);
++		mru = pppoatm_max_mru;
++	}
+ }
+ 
+ void plugin_init(void)
diff --git a/ppp.spec b/ppp.spec
index 316015a..a04483d 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.2
-Release: 6.2
+Release: 6.3
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -23,7 +23,8 @@ Patch12: ppp-2.4.2-pcap.patch
 Patch13: ppp-2.4.2-no_strip.patch
 Patch14: ppp-2.4.2-argv.patch
 Patch15: ppp-2.4.2-pppoatm.patch
-Patch16: ppp-2.4.2-pppoatm-make.patch
+Patch16: ppp-2.4.2-pppoatm-mtu.patch
+Patch17: ppp-2.4.2-pppoatm-make.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap
@@ -55,8 +56,9 @@ organization over a modem and phone line.
 %patch12 -p1 -b .pcap
 %patch13 -p1 -b .no_strip
 %patch14 -p1 -b .argv
-%patch15 -p1 -b .atm1
-%patch16 -p1 -b .atm2
+%patch15 -p1 -b .atm
+%patch16 -p1 -b .atm-mtu
+%patch17 -p1 -b .atm-make
 
 
 find . -type f -name "*.sample" | xargs rm -f 
@@ -115,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  7 2004 David Woodhouse <dwmw2@redhat.com> 2.4.2-6.3
+- Fix use of 'demand' without explicit MTU/MRU with pppoatm
+
 * Tue Oct  5 2004 David Woodhouse <dwmw2@redhat.com> 2.4.2-6.2
 - Link pppoatm plugin against libresolv.
 - Revert to linux-atm headers without the workaround for #127098