From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 12 Jul 2008 06:10:14 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=766e6e5e2e273362ceb0b2afda861a1f36406e1f;p=thirdparty%2Fsquid.git

Merged from trunk
---

766e6e5e2e273362ceb0b2afda861a1f36406e1f
diff --cc src/main.cc
index 7d0ea9cd38,b673775c84..7cf72217c7
--- a/src/main.cc
+++ b/src/main.cc
@@@ -964,15 -965,11 +962,13 @@@ mainInitialize(void
  
          FwdState::initModule();
          /* register the modules in the cache manager menus */
 -        accessLogRegisterWithCacheManager(manager);
 -        asnRegisterWithCacheManager(manager);
 -        authenticateRegisterWithCacheManager(&Config.authConfiguration, manager);
 -        carpRegisterWithCacheManager(manager);
 -        cbdataRegisterWithCacheManager(manager);
 +        // accessLogRegisterWithCacheManager(); //moved to accessLogInit()
 +        // asnRegisterWithCacheManager(); //moved to asnInit()
 +        // authenticateRegisterWithCacheManager(&Config.authConfiguration);
 +	//   moved authenticateInit()
- #if USE_CARP
 +        // carpRegisterWithCacheManager(); //moved to carpInit()
- #endif
 +
 +        cbdataRegisterWithCacheManager();
          /* These use separate calls so that the comm loops can eventually
           * coexist.
           */
diff --cc src/protos.h
index 2d44db917d,741556041f..48c494adbb
--- a/src/protos.h
+++ b/src/protos.h
@@@ -728,11 -728,9 +728,9 @@@ SQUIDCEXTERN char *internalRemoteUri(co
  SQUIDCEXTERN const char *internalHostname(void);
  SQUIDCEXTERN int internalHostnameIs(const char *);
  
- #if USE_CARP
  SQUIDCEXTERN void carpInit(void);
 -extern void carpRegisterWithCacheManager(CacheManager & manager);
 +extern void carpRegisterWithCacheManager();
  SQUIDCEXTERN peer *carpSelectParent(HttpRequest *);
- #endif
  
  
  #if USE_LEAKFINDER