Do an lcp_close whenever the link terminates, not just if it

terminates because of an error.  This is needed for persist
to work properly.

diff --git a/pppd/auth.c b/pppd/auth.c
index f34be0e4c57ccb27217b25169f04bacb01e4ad28..0f59f7f5b5bf3f8df4110aadde440957113c581a 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -68,7 +68,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: auth.c,v 1.102 2004/12/31 11:58:56 paulus Exp $"
+#define RCSID  "$Id: auth.c,v 1.103 2005/03/21 09:20:16 paulus Exp $"
 
 #include <stdio.h>
 #include <stddef.h>
@@ -584,9 +584,6 @@ link_required(unit)
     new_phase(PHASE_DEAD);
     if (the_channel->cleanup)
        (*the_channel->cleanup)();
-
-    /* XXX not nice here but needs to go somewhere... */
-    lcp_close(0, msg);
 }
 
 /*

diff --git a/pppd/main.c b/pppd/main.c
index f136a281291b297e8b81ace181b57397f0764d2a..b5702f2b07ffabe274661511c67d9ffb4cfda7ee 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -66,7 +66,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: main.c,v 1.149 2004/11/14 22:53:42 carlsonj Exp $"
+#define RCSID  "$Id: main.c,v 1.150 2005/03/21 09:20:16 paulus Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -551,6 +551,8 @@ main(argc, argv)
                }
            }
        }
+       /* restore FSMs to original state */
+       lcp_close(0, "");
 
        if (!persist || asked_to_quit || (maxfail > 0 && unsuccess >= maxfail))
            break;