New options system with priorities for option values, with options

[ppp.git] / pppd / chap.c

diff --git a/pppd/chap.c b/pppd/chap.c
index a0e821a1ce20f1d3e31138c1e53582600e857f64..3d7a660618af65dbf1ce71b6f896992a29ffce85 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -33,9 +33,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: chap.c,v 1.22 1999/08/12 04:25:20 paulus Exp $";
-#endif
+#define RCSID  "$Id: chap.c,v 1.25 2001/03/08 05:11:11 paulus Exp $"
 
 /*
  * TODO:
@@ -53,16 +51,18 @@ static const char rcsid[] = "$Id: chap.c,v 1.22 1999/08/12 04:25:20 paulus Exp $
 #include "chap_ms.h"
 #endif
 
+static const char rcsid[] = RCSID;
+
 /*
  * Command-line options.
  */
 static option_t chap_option_list[] = {
     { "chap-restart", o_int, &chap[0].timeouttime,
-      "Set timeout for CHAP" },
+      "Set timeout for CHAP", OPT_PRIO },
     { "chap-max-challenge", o_int, &chap[0].max_transmits,
-      "Set max #xmits for challenge" },
+      "Set max #xmits for challenge", OPT_PRIO },
     { "chap-interval", o_int, &chap[0].chal_interval,
-      "Set interval for rechallenge" },
+      "Set interval for rechallenge", OPT_PRIO },
 #ifdef MSLANMAN
     { "ms-lanman", o_bool, &ms_lanman,
       "Use LanMan passwd when using MS-CHAP", 1 },
@@ -741,7 +741,7 @@ ChapGenChallenge(cstate)
 {
     int chal_len;
     u_char *ptr = cstate->challenge;
-    unsigned int i;
+    int i;
 
     /* pick a random challenge length between MIN_CHALLENGE_LENGTH and 
        MAX_CHALLENGE_LENGTH */  
@@ -753,7 +753,7 @@ ChapGenChallenge(cstate)
     cstate->chal_transmits = 0;
 
     /* generate a random string */
-    for (i = 0; i < chal_len; i++ )
+    for (i = 0; i < chal_len; i++)
        *ptr++ = (char) (drand48() * 0xff);
 }