X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fauth.c;h=1858a06095c676da8207b53da31ef73e082f21ec;hb=d022609f9d30bbde0dd46b02f86d17a7f426ce26;hp=469b0f857411fc2c62ead751e8aed6522ebcdbe7;hpb=c2134507ca4699d192d79337a8fd2e947803dad9;p=ppp.git

diff --git a/pppd/auth.c b/pppd/auth.c
index 469b0f8..1858a06 100644
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -32,7 +32,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define RCSID	"$Id: auth.c,v 1.80 2002/07/16 13:11:43 kad Exp $"
+#define RCSID	"$Id: auth.c,v 1.83 2002/09/15 12:51:05 paulus Exp $"
 
 #include <stdio.h>
 #include <stddef.h>
@@ -228,14 +228,14 @@ option_t auth_options[] = {
     { "auth", o_bool, &auth_required,
       "Require authentication from peer", OPT_PRIO | 1 },
     { "noauth", o_bool, &auth_required,
-      "Don't require peer to authenticate", OPT_PRIOSUB | OPT_PRIV | OPT_A2COPY,
+      "Don't require peer to authenticate", OPT_PRIOSUB | OPT_PRIV,
       &allow_any_ip },
     { "require-pap", o_bool, &lcp_wantoptions[0].neg_upap,
       "Require PAP authentication from peer",
-      OPT_PRIOSUB | OPT_A2COPY | 1, &auth_required },
+      OPT_PRIOSUB | 1, &auth_required },
     { "+pap", o_bool, &lcp_wantoptions[0].neg_upap,
       "Require PAP authentication from peer",
-      OPT_ALIAS | OPT_PRIOSUB | OPT_A2COPY | 1, &auth_required },
+      OPT_ALIAS | OPT_PRIOSUB | 1, &auth_required },
     { "require-chap", o_bool, &lcp_wantoptions[0].neg_chap,
       "Require CHAP authentication from peer",
       OPT_PRIOSUB | OPT_A2COPY | OPT_A3OR | MDTYPE_MD5,
@@ -608,59 +608,62 @@ void
 start_networks(unit)
     int unit;
 {
-    static int started = 0;
     int i;
     struct protent *protp;
     int ecp_required, mppe_required;
 
-    if (!started) {
-	started = 1;
-	new_phase(PHASE_NETWORK);
+    new_phase(PHASE_NETWORK);
 
 #ifdef HAVE_MULTILINK
-	if (multilink) {
-	    if (mp_join_bundle()) {
-		if (updetach && !nodetach)
-		    detach();
-		return;
-	    }
+    if (multilink) {
+	if (mp_join_bundle()) {
+	    if (updetach && !nodetach)
+		detach();
+	    return;
 	}
+    }
 #endif /* HAVE_MULTILINK */
 
 #ifdef PPP_FILTER
-	if (!demand)
-	    set_filters(&pass_filter, &active_filter);
+    if (!demand)
+	set_filters(&pass_filter, &active_filter);
 #endif
-	/* Start CCP and ECP */
-	for (i = 0; (protp = protocols[i]) != NULL; ++i)
-	    if ((protp->protocol == PPP_ECP || protp->protocol == PPP_CCP)
-		&& protp->enabled_flag && protp->open != NULL)
-		(*protp->open)(0);
-    }
+    /* Start CCP and ECP */
+    for (i = 0; (protp = protocols[i]) != NULL; ++i)
+	if ((protp->protocol == PPP_ECP || protp->protocol == PPP_CCP)
+	    && protp->enabled_flag && protp->open != NULL)
+	    (*protp->open)(0);
 
     /*
-     * Bring up other network protocols after encryption has completed.
-     * OPENED here merely means that negotiation has completed.  It is
-     * up to the protocol to correctly terminate or disable LCP/NCP 
-     * based on the result of the negotiation.
+     * Bring up other network protocols iff encryption is not required.
      */
     ecp_required = ecp_gotoptions[unit].required;
     mppe_required = ccp_gotoptions[unit].mppe;
-    if ((!ecp_required && !mppe_required)
-	|| (ecp_required && ecp_fsm[unit].state == OPENED)
-	|| (mppe_required && ccp_fsm[unit].state == OPENED)) {
-	for (i = 0; (protp = protocols[i]) != NULL; ++i)
-	    if (protp->protocol < 0xC000
-		&& protp->protocol != PPP_CCP && protp->protocol != PPP_ECP
-		&& protp->enabled_flag && protp->open != NULL) {
-		(*protp->open)(0);
-		++num_np_open;
-	    }
+    if (!ecp_required && !mppe_required)
+	continue_networks(unit);
+}
 
-	if (num_np_open == 0)
-	    /* nothing to do */
-	    lcp_close(0, "No network protocols running");
-    }
+void
+continue_networks(unit)
+    int unit;
+{
+    int i;
+    struct protent *protp;
+
+    /*
+     * Start the "real" network protocols.
+     */
+    for (i = 0; (protp = protocols[i]) != NULL; ++i)
+	if (protp->protocol < 0xC000
+	    && protp->protocol != PPP_CCP && protp->protocol != PPP_ECP
+	    && protp->enabled_flag && protp->open != NULL) {
+	    (*protp->open)(0);
+	    ++num_np_open;
+	}
+
+    if (num_np_open == 0)
+	/* nothing to do */
+	lcp_close(0, "No network protocols running");
 }
 
 /*
@@ -1355,7 +1358,7 @@ plogin(user, passwd, msg)
     tty = devnam;
     if (strncmp(tty, "/dev/", 5) == 0)
 	tty += 5;
-    logwtmp(tty, user, remote_name);		/* Add wtmp login entry */
+    logwtmp(tty, user, ifname);		/* Add wtmp login entry */
 
 #if defined(_PATH_LASTLOG) && !defined(USE_PAM)
     if (pw != (struct passwd *)NULL) {