Don't delete sticky routes on exit as we may not have successfully

added them yet.  Instead just rely on our deleting all routes
associated with our interface.

2 files changed, 2 insertions, 16 deletions

diff --git a/usr.sbin/ppp/ppp/ipcp.c b/usr.sbin/ppp/ppp/ipcp.c
index 7ad0d342d70..a230d4cab87 100644
--- a/usr.sbin/ppp/ppp/ipcp.c
+++ b/usr.sbin/ppp/ppp/ipcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $OpenBSD: ipcp.c,v 1.26 2000/08/28 22:44:41 brian Exp $
+ * $OpenBSD: ipcp.c,v 1.27 2000/09/02 22:12:41 brian Exp $
  *
  *	TODO:
  *		o Support IPADDRS properly
@@ -924,8 +924,6 @@ ipcp_CleanInterface(struct ipcp *ipcp)
 {
   struct iface *iface = ipcp->fsm.bundle->iface;
 
-  route_Clean(ipcp->fsm.bundle, ipcp->route);
-
   if (iface->in_addrs && (Enabled(ipcp->fsm.bundle, OPT_PROXY) ||
                           Enabled(ipcp->fsm.bundle, OPT_PROXYALL))) {
     int s = ID0socket(AF_INET, SOCK_DGRAM, 0);
diff --git a/usr.sbin/ppp/ppp/route.c b/usr.sbin/ppp/ppp/route.c
index 2c07d0aa92d..547e5ed6675 100644
--- a/usr.sbin/ppp/ppp/route.c
+++ b/usr.sbin/ppp/ppp/route.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $OpenBSD: route.c,v 1.9 2000/07/20 10:39:10 brian Exp $
+ * $OpenBSD: route.c,v 1.10 2000/09/02 22:12:41 brian Exp $
  *
  */
 
@@ -570,18 +570,6 @@ route_Change(struct bundle *bundle, struct sticky_route *r,
 }
 
 void
-route_Clean(struct bundle *bundle, struct sticky_route *r)
-{
-  struct in_addr none, del;
-
-  none.s_addr = INADDR_ANY;
-  for (; r; r = r->next) {
-    del.s_addr = r->dst.s_addr & r->mask.s_addr;
-    bundle_SetRoute(bundle, RTM_DELETE, del, none, none, 1, 0);
-  }
-}
-
-void
 route_Add(struct sticky_route **rp, int type, struct in_addr dst,
           struct in_addr mask, struct in_addr gw)
 {