From d31184e2a7d91cdcacafa76846d7c9deef433b98 Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Mon, 17 Apr 2000 06:13:18 +0000
Subject: [PATCH] disable IPv6CP by default, to be friendly with old
 (IPv4-only) config file. add "+ipv6" which enables IPv6CP.  it is necessary
 if you want IPv6CP.

option name in sync with ppp-2.3.11.
---
 usr.sbin/pppd/pppd/ipv6cp.c |  8 +++++---
 usr.sbin/pppd/pppd/pppd.8   | 14 ++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/pppd/pppd/ipv6cp.c b/usr.sbin/pppd/pppd/ipv6cp.c
index 023eeb091e26..b1109605caa5 100644
--- a/usr.sbin/pppd/pppd/ipv6cp.c
+++ b/usr.sbin/pppd/pppd/ipv6cp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipv6cp.c,v 1.4 2000/01/20 04:55:52 itojun Exp $	*/
+/*	$NetBSD: ipv6cp.c,v 1.5 2000/04/17 06:13:18 itojun Exp $	*/
 
 /*
  * ipv6cp.c - PPP IPV6 Control Protocol.
@@ -35,7 +35,7 @@
 #if 0
 #define RCSID	"Id: ipv6cp.c,v 1.3 1999/08/24 05:31:09 paulus Exp "
 #else
-__RCSID("$NetBSD: ipv6cp.c,v 1.4 2000/01/20 04:55:52 itojun Exp $");
+__RCSID("$NetBSD: ipv6cp.c,v 1.5 2000/04/17 06:13:18 itojun Exp $");
 #endif
 #endif
 
@@ -128,6 +128,8 @@ static option_t ipv6cp_option_list[] = {
       "Disable IPv6 and IPv6CP" },
     { "-ipv6", o_bool, &ipv6cp_protent.enabled_flag,
       "Disable IPv6 and IPv6CP" },
+    { "+ipv6", o_bool, &ipv6cp_protent.enabled_flag,
+      "Enable IPv6 and IPv6CP", 1 },
 
     { "ipv6cp-accept-local", o_bool, &ipv6cp_allowoptions[0].accept_local,
       "Accept peer's interface identifier for us", 1 },
@@ -174,7 +176,7 @@ struct protent ipv6cp_protent = {
     ipv6cp_close,
     ipv6cp_printpkt,
     NULL,
-    1,
+    0,
     "IPV6CP",
     "IPV6",
     ipv6cp_option_list,
diff --git a/usr.sbin/pppd/pppd/pppd.8 b/usr.sbin/pppd/pppd/pppd.8
index 3273e061082e..70e79934d295 100644
--- a/usr.sbin/pppd/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pppd.8,v 1.26 1999/10/28 09:41:56 is Exp $
+.\"	$NetBSD: pppd.8,v 1.27 2000/04/17 06:13:18 itojun Exp $
 .\" manual page [] for pppd 2.3
 .\" Id: pppd.8,v 1.46 1999/08/24 05:31:10 paulus Exp 
 .\" SH section heading
@@ -354,6 +354,13 @@ Provides an extra parameter to the ip-up and ip-down scripts.  If this
 option is given, the \fIstring\fR supplied is given as the 6th
 parameter to those scripts.
 .TP
+.B +ipv6
+Enable IPv6CP negotiation and IPv6 communication.
+It needs to be explicitly specified if you want IPv6CP.
+.TP
+.B -ipv6
+Disable IPv6CP negotiation and IPv6 communication.
+.TP
 .B ipv6cp-max-configure \fIn
 Set the maximum number of IPv6CP configure-request transmissions to
 \fIn\fR (default 10).
@@ -608,9 +615,8 @@ only be required if the peer is buggy and gets confused by requests
 from pppd for IPCP negotiation.
 .TP
 .B noipv6
-Disable IPv6CP negotiation and IPv6 communication. This option should
-only be required if the peer is buggy and gets confused by requests
-from pppd for IPv6CP negotiation.
+An alias for
+.B -ipv6.
 .TP
 .B noipdefault
 Disables the default behaviour when no local IP address is specified,