More cache manager initialization calls reshuffling.

diff --git a/src/dns.cc b/src/dns.cc
index 004ede5fb9e427a29fbead7985b14764c90bbc2d..8e2c0c8f93691ad04d25aa010c65e24c25ce5a82 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -60,6 +60,8 @@ dnsInit(void)
 {
     wordlist *w;
 
+    dnsRegisterWithCacheManager();
+
     if (!Config.Program.dnsserver)
         return;
 

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index f5f52aed793feab21b748510bda90704890d214d..f9d92a48ee3902a89815a90d25a765c5d8e72b8f 100755 (executable)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1381,6 +1381,8 @@ idnsInit(void)
         idns_lookup_hash = hash_create((HASHCMP *) strcmp, 103, hash_string);
         init++;
     }
+
+    idnsRegisterWithCacheManager();
 }
 
 void

diff --git a/src/main.cc b/src/main.cc
index 7cf72217c7e0bf450d38817591113cbdf7a2cbfa..62d732d2aba8de9a93c89f6b3e24d74daa4e0b81 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -995,7 +995,7 @@ mainInitialize(void)
        //  moved to each module's init() function
 #if USE_DNSSERVERS
 
-        dnsRegisterWithCacheManager();
+        // dnsRegisterWithCacheManager(); //moved to dnsInit()
 #endif
 
         eventInit();
@@ -1004,8 +1004,9 @@ mainInitialize(void)
         FwdState::RegisterWithCacheManager();
         httpHeaderRegisterWithCacheManager();
 #if !USE_DNSSERVERS
-
-        idnsRegisterWithCacheManager();
+       //TODO: remove cache manager registration functions from namespace
+       //      (protos.h and make them static where appropriate)
+        // idnsRegisterWithCacheManager(); // moved to idnsInit()
 #endif
 
         // ipcacheRegisterWithCacheManager(); //moved to ipcache_init()