X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fccp.c;h=d6da2d56923fe8493eaa7aee6dabf90d3ceb3c3e;hb=739142cddb7369c7611eeed081a80d52b7b992c9;hp=05cca767093158ca9b61d95360803ac3d92aa7fc;hpb=1e7bc3ea35208555bf233daacee9d85ded13f999;p=ppp.git

diff --git a/pppd/ccp.c b/pppd/ccp.c
index 05cca76..d6da2d5 100644
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -25,9 +25,7 @@
  * OR MODIFICATIONS.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.26 1999/03/16 22:54:38 paulus Exp $";
-#endif
+#define RCSID	"$Id: ccp.c,v 1.29 1999/08/13 06:46:11 paulus Exp $"
 
 #include <stdlib.h>
 #include <string.h>
@@ -37,6 +35,8 @@ static char rcsid[] = "$Id: ccp.c,v 1.26 1999/03/16 22:54:38 paulus Exp $";
 #include "ccp.h"
 #include <net/ppp-comp.h>
 
+static const char rcsid[] = RCSID;
+
 /*
  * Command-line options.
  */
@@ -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));
 	    }