diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-07-11 22:36:18 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-07-11 22:36:18 +0000 |
| commit | a63db0733bf171e487466e8dd58350b18a6db1a7 (patch) | |
| tree | 801e7be6170ecca77ed0349f4253d0adc982052f | |
| parent | 5a85660866b04cf43de76b870c02052c79125f75 (diff) | |
rev 1.30
If IPCP is disabled, susccess of IPV6CP negotiation is sufficient
to communicate by IPv6. So, the prompt should be `PPP' rather
than `PPp'.
From ume FreeBSD
ok deraadt@
| -rw-r--r-- | usr.sbin/ppp/ppp/prompt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/ppp/ppp/prompt.c b/usr.sbin/ppp/ppp/prompt.c index bd353550b2c..0d37ca287df 100644 --- a/usr.sbin/ppp/ppp/prompt.c +++ b/usr.sbin/ppp/ppp/prompt.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: prompt.c,v 1.15 2003/04/07 23:58:53 deraadt Exp $ + * $OpenBSD: prompt.c,v 1.16 2005/07/11 22:36:17 brad Exp $ */ #include <sys/param.h> @@ -103,6 +103,11 @@ prompt_Display(struct prompt *p) if (p->bundle->ncp.ipcp.fsm.state == ST_OPENED) pconnect = "PPP"; +#ifndef NOINET6 + else if (!Enabled(p->bundle, OPT_IPCP) && + p->bundle->ncp.ipv6cp.fsm.state == ST_OPENED) + pconnect = "PPP"; +#endif else if (bundle_Phase(p->bundle) == PHASE_NETWORK) pconnect = "PPp"; else if (bundle_Phase(p->bundle) == PHASE_AUTHENTICATE) |