rpms/ppp/devel ppp-2.4.3-ipv6-accept-remote.patch, NONE, 1.1 ppp.spec, 1.32, 1.33

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6877

Modified Files:
	ppp.spec 
Added Files:
	ppp-2.4.3-ipv6-accept-remote.patch 
Log Message:
add ipv6cp-accept-remote to make my DSL work with demand dial and native IPv6

ppp-2.4.3-ipv6-accept-remote.patch:
 ipv6cp.c |    5 ++++-
 ipv6cp.h |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE ppp-2.4.3-ipv6-accept-remote.patch ---
--- ppp-2.4.3/pppd/ipv6cp.c~	2005-11-04 09:40:10.000000000 +0000
+++ ppp-2.4.3/pppd/ipv6cp.c	2005-11-04 10:20:14.000000000 +0000
@@ -235,6 +235,8 @@ static option_t ipv6cp_option_list[] = {
 
     { "ipv6cp-accept-local", o_bool, &ipv6cp_allowoptions[0].accept_local,
       "Accept peer's interface identifier for us", 1 },
+    { "ipv6cp-accept-remote", o_bool, &ipv6cp_allowoptions[0].accept_remote,
+      "Accept peer's interface identifier for itself", 1 },
 
     { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip,
       "Use (default) IPv4 address as interface identifier", 1 },
@@ -427,6 +429,7 @@ ipv6cp_init(unit)
     memset(ao, 0, sizeof(*ao));
 
     wo->accept_local = 1;
+    wo->accept_remote = 1;
     wo->neg_ifaceid = 1;
     ao->neg_ifaceid = 1;
 
@@ -952,7 +955,7 @@ ipv6cp_reqci(f, inp, len, reject_if_disa
 		orc = CONFREJ;		/* Reject CI */
 		break;
 	    }
-	    if (!eui64_iszero(wo->hisid) && 
+	    if (!eui64_iszero(wo->hisid) && !wo->accept_remote &&
 		!eui64_equals(ifaceid, wo->hisid) && 
 		eui64_iszero(go->hisid)) {
 		    
--- ppp-2.4.3/pppd/ipv6cp.h~	2002-12-04 23:03:32.000000000 +0000
+++ ppp-2.4.3/pppd/ipv6cp.h	2005-11-04 10:20:55.000000000 +0000
@@ -150,7 +150,8 @@
 typedef struct ipv6cp_options {
     int neg_ifaceid;		/* Negotiate interface identifier? */
     int req_ifaceid;		/* Ask peer to send interface identifier? */
-    int accept_local;		/* accept peer's value for iface id? */
+    int accept_local;		/* accept peer's value for our iface id? */
+    int accept_remote;		/* accept peer's value for his iface id? */
     int opt_local;		/* ourtoken set by option */
     int opt_remote;		/* histoken set by option */
     int use_ip;			/* use IP as interface identifier */


Index: ppp.spec
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ppp.spec	7 Oct 2005 14:36:03 -0000	1.32
+++ ppp.spec	4 Nov 2005 10:35:46 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.3
-Release: 4
+Release: 5
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -23,6 +23,7 @@
 Patch17: ppp-2.4.2-pppoatm-make.patch
 Patch18: ppp-2.4.3-radiusplugin.patch
 Patch19: ppp-2.4.3-local.patch
+Patch20: ppp-2.4.3-ipv6-accept-remote.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap
@@ -55,6 +56,7 @@
 %patch17 -p1 -b .atm-make
 %patch18 -p1 -b .radiusplugin
 %patch19 -p1 -b .local
+%patch20 -p1 -b .ipv6cp
 
 
 find . -type f -name "*.sample" | xargs rm -f 
@@ -116,6 +118,9 @@
 
 
 %changelog
+* Fri Nov  4 2005 David Woodhouse <dwmw2 at redhat.com> 2.4.3-5
+- Implement ipv6cp-accept-remote option
+
 * Fri Oct  7 2005 Tomas Mraz <tmraz at redhat.com> 2.4.3-4
 - use include instead of pam_stack in pam config