X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=pppd%2Fauth.c;h=e97b48eaf439e730eed5ce80383f90e73ed282c5;hb=c78a7871372d34276aa45d0ca1cd04511930bd24;hp=83b0e0683be9e8f96116c3b9de46e4de73c78e40;hpb=aff0ed820736610ce24be24ce246aeeb90ff5cd1;p=ppp.git

diff --git a/pppd/auth.c b/pppd/auth.c
index 83b0e06..e97b48e 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.60 1999/12/23 01:25:13 paulus Exp $"
+#define RCSID	"$Id: auth.c,v 1.63 2000/04/04 07:06:49 paulus Exp $"
 
 #include <stdio.h>
 #include <stddef.h>
@@ -509,6 +509,13 @@ start_networks()
     struct protent *protp;
 
     new_phase(PHASE_NETWORK);
+
+#ifdef HAVE_MULTILINK
+    if (multilink)
+	if (mp_join_bundle())
+	    return;
+#endif /* HAVE_MULTILINK */
+
 #if 0
     if (!demand)
 	set_filters(&pass_filter, &active_filter);
@@ -570,7 +577,7 @@ auth_peer_success(unit, protocol, name, namelen)
 	namelen = sizeof(peer_authname) - 1;
     BCOPY(name, peer_authname, namelen);
     peer_authname[namelen] = 0;
-    script_setenv("PEERNAME", peer_authname);
+    script_setenv("PEERNAME", peer_authname, 0);
 
     /*
      * If there is no more authentication still to be done,
@@ -1570,7 +1577,7 @@ auth_ip_addr(unit, addr)
     }
     if (auth_required)
 	return 0;		/* no addresses authorized */
-    return allow_any_ip || !have_route_to(addr);
+    return allow_any_ip || privileged || !have_route_to(addr);
 }
 
 static int