Patch from Frank Cusack to add support for MSCHAPv2.

[ppp.git] / pppd / cbcp.c

diff --git a/pppd/cbcp.c b/pppd/cbcp.c
index d2f4786737d5e7d1e9d7ea8328ad787b81c303a1..e48aa4637d72c3a2cafdcc6ec06f558ba71fe5f7 100644 (file)
--- a/pppd/cbcp.c
+++ b/pppd/cbcp.c
@@ -18,9 +18,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: cbcp.c,v 1.5 1999/03/16 02:58:01 paulus Exp $";
-#endif
+#define RCSID  "$Id: cbcp.c,v 1.11 2001/03/08 05:11:10 paulus Exp $"
 
 #include <stdio.h>
 #include <string.h>
@@ -31,7 +29,8 @@ static char rcsid[] = "$Id: cbcp.c,v 1.5 1999/03/16 02:58:01 paulus Exp $";
 #include "cbcp.h"
 #include "fsm.h"
 #include "lcp.h"
-#include "ipcp.h"
+
+static const char rcsid[] = RCSID;
 
 /*
  * Options.
@@ -40,7 +39,7 @@ static int setcbcp __P((char **));
 
 static option_t cbcp_option_list[] = {
     { "callback", o_special, setcbcp,
-      "Ask for callback" },
+      "Ask for callback", OPT_PRIO | OPT_A2STRVAL, &cbcp[0].us_number },
     { NULL }
 };
 
@@ -69,6 +68,7 @@ struct protent cbcp_protent = {
     NULL,
     0,
     "CBCP",
+    NULL,
     cbcp_option_list,
     NULL,
     NULL,
@@ -383,7 +383,7 @@ cbcp_resp(us)
        PUTCHAR(len , bufp);
        PUTCHAR(0, bufp);
        cbcp_send(us, CBCP_RESP, buf, len);
-       (*ipcp_protent.open)(us->us_unit);
+       start_networks();
        return;
     }
 }
@@ -438,6 +438,8 @@ cbcp_recvack(us, pckt, len)
            if (address[0])
                dbglog("peer will call: %s", address);
        }
+       if (type == CB_CONF_NO)
+           return;
     }
 
     cbcp_up(us);
@@ -450,4 +452,5 @@ cbcp_up(us)
 {
     persist = 0;
     lcp_close(0, "Call me back, please");
+    status = EXIT_CALLBACK;
 }