fix asn acl initialize stuff

diff --git a/src/asn.cc b/src/asn.cc
index 3dc6074f9b8326328db7ced2fc5172ba9814790d..6d092ecdcdcae0cc2a891a09c45943d50f2832e8 100644 (file)
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: asn.cc,v 1.30 1998/04/09 17:56:14 wessels Exp $
+ * $Id: asn.cc,v 1.31 1998/04/25 07:07:42 wessels Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -88,6 +88,7 @@ static CNCB whoisConnectDone;
 static PF whoisReadReply;
 static STCB asHandleReply;
 static int destroyRadixNode(struct radix_node *rn, void *w);
+static void asnAclInitialize(acl * acls);
 
 static void destroyRadixNodeInfo(as_info *);
 
@@ -129,7 +130,7 @@ asnMatchIp(void *data, struct in_addr addr)
     return 0;
 }
 
-void
+static void
 asnAclInitialize(acl * acls)
 {
     acl *a;
@@ -152,6 +153,7 @@ asnInit(void)
     max_keylen = 40;
     rn_init();
     rn_inithead((void **) &AS_tree_head, 8);
+    asnAclInitialize(Config.aclList);
 }
 
 void

diff --git a/src/main.cc b/src/main.cc
index 41a076bf93db963560b11e1e3f7457316930c993..79f823e271420d9e788e4346ad5c48ed6e8784aa 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.247 1998/04/24 18:27:50 wessels Exp $
+ * $Id: main.cc,v 1.248 1998/04/25 07:07:40 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -360,6 +360,7 @@ serverConnectionsClose(void)
 #ifdef SQUID_SNMP
     snmpConnectionShutdown();
 #endif
+    asnFreeMemory();
 }
 
 static void
@@ -377,13 +378,11 @@ mainReconfigure(void)
     snmpConnectionClose();
 #endif
     dnsShutdownServers();
-    asnFreeMemory();
     redirectShutdownServers();
     storeDirCloseSwapLogs();
     errorFree();
     parseConfigFile(ConfigFile);
     _db_init(Config.Log.log, Config.debugOptions);
-    asnAclInitialize(Config.aclList);  /* reload network->AS database */
     ipcache_restart();         /* clear stuck entries */
     fqdncache_restart();       /* sigh, fqdncache too */
     errorInitialize();         /* reload error pages */
@@ -482,7 +481,6 @@ mainInitialize(void)
        cachemgrInit();
        statInit();
        storeInit();
-       asnAclInitialize(Config.aclList);
        if (Config.effectiveUser) {
            /* we were probably started as root, so cd to a swap
             * directory in case we dump core */

diff --git a/src/protos.h b/src/protos.h
index faab68b9ded13f1ac3b6a8beb863e248e5349be6..5f26c69bc6645d097623fe5fac0ff310e8b195af 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -864,7 +864,6 @@ extern int pconnPop(const char *host, u_short port);
 extern void pconnInit(void);
 
 extern int asnMatchIp(void *, struct in_addr);
-extern void asnAclInitialize(acl *);
 extern void asnInit(void);
 extern void asnFreeMemory(void);
 extern void dlinkAdd(void *data, dlink_node *, dlink_list *);