X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipv6cp.c;h=3a370a0caa96fe55a5486c9a4c6730aeb2f8efc2;hp=b877625c74f55f7bc4b5384222e9d11d3411553d;hb=8832e3ba208085ae3f15c0d48c2bb7a02bc9ae79;hpb=37a8acc7ee2527693d0c8ba82b2eaea249abde34 diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c index b877625..3a370a0 100644 --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c @@ -90,10 +90,10 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipv6cp.c,v 1.13 2001/03/08 05:11:12 paulus Exp $ + * $Id: ipv6cp.c,v 1.15 2001/03/22 00:42:33 paulus Exp $ */ -#define RCSID "$Id: ipv6cp.c,v 1.13 2001/03/08 05:11:12 paulus Exp $" +#define RCSID "$Id: ipv6cp.c,v 1.15 2001/03/22 00:42:33 paulus Exp $" /* * TODO: @@ -331,7 +331,7 @@ setifaceid(argv) } static void -printipaddr(opt, printer, arg) +printifaceid(opt, printer, arg) option_t *opt; void (*printer) __P((void *, char *, ...)); void *arg; @@ -1024,6 +1024,9 @@ ipv6_check_options() { ipv6cp_options *wo = &ipv6cp_wantoptions[0]; + if (!ipv6cp_protent.enabled_flag) + return; + #if defined(SOL2) /* * Persistent link-local id is only used when user has not explicitly