From 0ffaca107874eaf375d1c1518beb6f4ad66cd6dc Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Fri, 27 Feb 1998 23:07:07 +0000
Subject: [PATCH] 1) in CleanupAliasData, don't nullify entry in linkTableOut  
  since there might be permanent entries still left after    calls to
 DeleteLink (it will be nullified by DeleteLink    if all entries are deleted,
 won't it ?)

2) in PacketAliasSetAddress, set the aliasing address
   even when PKT_ALIAS_RESET_ON_ADDR_CHANGE is in effect.
   Just don't clean up links in this case.

Submitted by: Ari Suutari <ari@suutari.iki.fi>
         via: Charles Mott <cmott@srv.net>
PR: 5041
---
 lib/libalias/alias_db.c         | 6 ++----
 sys/netinet/libalias/alias_db.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/libalias/alias_db.c b/lib/libalias/alias_db.c
index fac7ece600e..18983d2674d 100644
--- a/lib/libalias/alias_db.c
+++ b/lib/libalias/alias_db.c
@@ -677,7 +677,6 @@ CleanupAliasData(void)
     for (i=0; i<LINK_TABLE_OUT_SIZE; i++)
     {
         link = linkTableOut[i];
-        linkTableOut[i] = NULL;
         while (link != NULL)
         {
             struct alias_link *link_next;
@@ -1940,10 +1939,9 @@ PacketAliasSetAddress(struct in_addr addr)
 {
     if (packetAliasMode & PKT_ALIAS_RESET_ON_ADDR_CHANGE
      && aliasAddress.s_addr != addr.s_addr)
-    {
         CleanupAliasData();
-        aliasAddress = addr;
-    }
+
+    aliasAddress = addr;
 }
 
 
diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index fac7ece600e..18983d2674d 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -677,7 +677,6 @@ CleanupAliasData(void)
     for (i=0; i<LINK_TABLE_OUT_SIZE; i++)
     {
         link = linkTableOut[i];
-        linkTableOut[i] = NULL;
         while (link != NULL)
         {
             struct alias_link *link_next;
@@ -1940,10 +1939,9 @@ PacketAliasSetAddress(struct in_addr addr)
 {
     if (packetAliasMode & PKT_ALIAS_RESET_ON_ADDR_CHANGE
      && aliasAddress.s_addr != addr.s_addr)
-    {
         CleanupAliasData();
-        aliasAddress = addr;
-    }
+
+    aliasAddress = addr;
 }