Back out the previous fix to deal with kernels that don't support IPv6,

and implement a far more subtle and correct fix.

The reason behind the infinite loop was that ppp was trying to make up
initial IPv6 numbers and wasn't giving up when it failed unexpectedly to
assign the addresses it just fabricated to it's interface (thinking that
the reason was because another interface was using the same address).
It now attempts this up to 100 times before just failing and trying to
muddle along (in reality, this should never happen more than a couple
of times unless our random number generator doesn't work).

Also, when IPv6 is not available, don't even try to assign the IPv6
interface address in the first place...

1 files changed, 1 insertions, 2 deletions

diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 9f4cc0c..47bcd68 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -68,7 +68,6 @@
 #include "async.h"
 #include "physical.h"
 #include "proto.h"
-#include "probe.h"
 
 static void FsmSendConfigReq(struct fsm *);
 static void FsmSendTerminateReq(struct fsm *);
@@ -897,7 +896,7 @@ FsmRecvProtoRej(struct fsm *fp, struct fsmheader *lhp, struct mbuf *bp)
     break;
 #ifndef NOINET6
   case PROTO_IPV6CP:
-    if (probe.ipv6_available && fp->proto == PROTO_LCP) {
+    if (fp->proto == PROTO_LCP) {
       log_Printf(LogPHASE, "%s: IPV6CP protocol reject closes IPV6CP !\n",
                 fp->link->name);
       fsm_Close(&fp->bundle->ncp.ipv6cp.fsm);