X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fcbcp.c;h=73cbcf02355110341840ee11c6ae35c9260f1b10;hb=1a39a96301b795cda440a54192833c1ae96c7670;hp=d2f4786737d5e7d1e9d7ea8328ad787b81c303a1;hpb=f1c955be4c9a9a1a0ac000e063124b9f8122a45d;p=ppp.git

diff --git a/pppd/cbcp.c b/pppd/cbcp.c
index d2f4786..73cbcf0 100644
--- a/pppd/cbcp.c
+++ b/pppd/cbcp.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: cbcp.c,v 1.5 1999/03/16 02:58:01 paulus Exp $";
+static const char rcsid[] = "$Id: cbcp.c,v 1.9 1999/08/12 04:25:19 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -31,7 +31,6 @@ 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"
 
 /*
  * Options.
@@ -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;
 }