moved more stuff into sys-*.c

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index 9a04ecf53793edc646520e59b8038dae0aa43164..c4ea4157a232856ec5314c4fad82c24c24055853 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.5 1994/05/24 11:20:26 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.8 1994/08/22 00:36:38 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -55,14 +55,11 @@ static char rcsid[] = "$Id: auth.c,v 1.5 1994/05/24 11:20:26 paulus Exp $";
 #include "upap.h"
 #include "chap.h"
 #include "ipcp.h"
+#include "ccp.h"
 #include "pathnames.h"
 
 #ifdef sparc
 #include <alloca.h>
-#ifndef __GNUC__
-/* why alloca.h doesn't define what alloca() returns is a mystery */
-/* char *alloca __ARGS((int)); */
-#endif /*__GNUC__*/
 #endif /*sparc*/
 
 /* Used for storing a sequence of words.  Usually malloced. */
@@ -82,7 +79,7 @@ struct wordlist {
 
 extern char user[];
 extern char passwd[];
-extern char devname[];
+extern char devnam[];
 extern char our_name[];
 extern char remote_name[];
 extern char hostname[];
@@ -104,6 +101,7 @@ static struct wordlist *addresses[NPPP];
 /* Prototypes */
 void check_access __ARGS((FILE *, char *));
 
+static void network_phase __ARGS((int));
 static int  login __ARGS((char *, char *, char **, int *));
 static void logout __ARGS((void));
 static int  null_login __ARGS((int));
@@ -134,6 +132,8 @@ void
 link_terminated(unit)
     int unit;
 {
+    if (phase == PHASE_DEAD)
+       return;
     if (logged_in)
        logout();
     phase = PHASE_DEAD;
@@ -147,6 +147,8 @@ void
 link_down(unit)
     int unit;
 {
+    ipcp_close(0);
+    ccp_close(0);
     phase = PHASE_TERMINATE;
 }
 
@@ -195,10 +197,20 @@ link_established(unit)
     }
     auth_pending[unit] = auth;
 
-    if (!auth) {
-       phase = PHASE_NETWORK;
-       ipcp_open(unit);
-    }
+    if (!auth)
+       network_phase(unit);
+}
+
+/*
+ * Proceed to the network phase.
+ */
+static void
+network_phase(unit)
+    int unit;
+{
+    phase = PHASE_NETWORK;
+    ipcp_open(unit);
+    ccp_open(unit);
 }
 
 /*
@@ -244,6 +256,7 @@ auth_peer_success(unit, protocol)
     if ((auth_pending[unit] &= ~bit) == 0) {
        phase = PHASE_NETWORK;
        ipcp_open(unit);
+       ccp_open(unit);
     }
 }
 
@@ -287,10 +300,8 @@ auth_withpeer_success(unit, protocol)
      * If there is no more authentication still being done,
      * proceed to the network phase.
      */
-    if ((auth_pending[unit] &= ~bit) == 0) {
-       phase = PHASE_NETWORK;
-       ipcp_open(unit);
-    }
+    if ((auth_pending[unit] &= ~bit) == 0)
+       network_phase(unit);
 }
 
 
@@ -415,7 +426,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
         */
        if (attempts++ >= 10) {
            syslog(LOG_WARNING, "%d LOGIN FAILURES ON %s, %s",
-                  attempts, devname, user);
+                  attempts, devnam, user);
            quit();
        }
        if (attempts > 3)
@@ -477,9 +488,9 @@ login(user, passwd, msg, msglen)
     /*
      * Write a wtmp entry for this user.
      */
-    tty = strrchr(devname, '/');
+    tty = strrchr(devnam, '/');
     if (tty == NULL)
-       tty = devname;
+       tty = devnam;
     else
        tty++;
     logwtmp(tty, user, "");            /* Add wtmp login entry */
@@ -496,9 +507,9 @@ logout()
 {
     char *tty;
 
-    tty = strrchr(devname, '/');
+    tty = strrchr(devnam, '/');
     if (tty == NULL)
-       tty = devname;
+       tty = devnam;
     else
        tty++;
     logwtmp(tty, "", "");              /* Wipe out wtmp logout entry */