fix problem where lcp echo requests were getting doubled,

[ppp.git] / pppd / cbcp.c

diff --git a/pppd/cbcp.c b/pppd/cbcp.c
index d2f4786737d5e7d1e9d7ea8328ad787b81c303a1..34ba6f756a4a2319ee7c15d649d214cc86dc88cf 100644 (file)
--- 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 char rcsid[] = "$Id: cbcp.c,v 1.7 1999/05/12 06:19:46 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -69,6 +69,7 @@ struct protent cbcp_protent = {
     NULL,
     0,
     "CBCP",
+    NULL,
     cbcp_option_list,
     NULL,
     NULL,
@@ -438,6 +439,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 +453,5 @@ cbcp_up(us)
 {
     persist = 0;
     lcp_close(0, "Call me back, please");
+    status = EXIT_CALLBACK;
 }