X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipv6cp.c;h=58573363ea8d9b9c6b0145118d97c4798b65bf18;hb=2a7981f8ca0fc6660146885b75f7a663fe221119;hp=47e34229e0cdff4b044200a5c28fc4a33f868cc3;hpb=0678d3bf69116af58b00fbc64bd4185acb4d5c37;p=ppp.git

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index 47e3422..5857336 100644
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -245,6 +245,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 },
 
     { "defaultroute6", o_bool, &ipv6cp_wantoptions[0].default_route,
       "Add default IPv6 route", OPT_ENABLE|1, &ipv6cp_allowoptions[0].default_route },
@@ -444,6 +446,7 @@ ipv6cp_init(unit)
     memset(ao, 0, sizeof(*ao));
 
     wo->accept_local = 0;
+    wo->accept_remote = 0;
     wo->neg_ifaceid = 1;
     ao->neg_ifaceid = 1;
 
@@ -547,6 +550,8 @@ ipv6cp_resetci(f)
 	wo->accept_local = 1;
 	eui64_magic_nz(wo->ourid);
     }
+    if (!wo->opt_remote)
+	wo->accept_remote = 1;
     
     *go = *wo;
     eui64_zero(go->hisid);	/* last proposed interface identifier */
@@ -974,7 +979,7 @@ ipv6cp_reqci(f, inp, len, reject_if_disagree)
 		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)) {