X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fccp.c;h=7eae64d1c374aa23264d4f484f46faa78b0ac46b;hb=f4cdbd273ac5142ed42e8e3fd7eb1109cd58119a;hp=05cca767093158ca9b61d95360803ac3d92aa7fc;hpb=75951d7bb62003e37dd390e773df19f16250d27d;p=ppp.git diff --git a/pppd/ccp.c b/pppd/ccp.c index 05cca76..7eae64d 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -26,7 +26,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ccp.c,v 1.26 1999/03/16 22:54:38 paulus Exp $"; +static char rcsid[] = "$Id: ccp.c,v 1.27 1999/03/19 01:19:30 paulus Exp $"; #endif #include @@ -708,12 +708,9 @@ ccp_nakci(f, p, len) /* * Predictor-1 and 2 have no options, so they can't be Naked. * - * XXX What should we do with any remaining options? + * There may be remaining options but we ignore them. */ - if (len != 0) - return 0; - if (f->state != OPENED) *go = try; return 1; @@ -1034,7 +1031,7 @@ ccp_up(f) if (go->method == ho->method) { notice("%s compression enabled", method_name(go, ho)); } else { - strlcpy(method1, sizeof(method1), method_name(go, NULL)); + strlcpy(method1, method_name(go, NULL), sizeof(method1)); notice("%s / %s compression enabled", method1, method_name(ho, NULL)); }