Re: cvs commit: squid3/src Makefile.am cf.data.pre net_db.cc structs.h

[Tsantilas Christos]

Hi Henrik,
  there is a small error in this patch. I am attaching a fix ....

Regards,
   Christos


Henrik Nordstrom wrote:
> hno         2007/12/27 07:55:47 MST
> 
>   Modified files:
>     src                  Makefile.am cf.data.pre net_db.cc 
>                          structs.h 
>   Log:
>   netdb_filename directive to specify location of netdb state file
>   
>   was hardcoded to use the first cache_dir. This moves the default location
>   to the logs directory and may be overridden at compile time by setting
>   DEFAULT_NETDB_FILE
>   
>   Revision  Changes    Path
>   1.196     +3 -1      squid3/src/Makefile.am
>   1.490     +10 -1     squid3/src/cf.data.pre
>   1.200     +10 -19    squid3/src/net_db.cc
>   1.571     +2 -1      squid3/src/structs.h
> 
> 


Index: net_db.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/net_db.cc,v
retrieving revision 1.36
diff -u -r1.36 net_db.cc
--- net_db.cc	27 Dec 2007 15:51:03 -0000	1.36
+++ net_db.cc	29 Dec 2007 09:08:43 -0000
@@ -466,7 +466,7 @@
 static void
 netdbSaveState(void *foo)
 {
-    if (strcmp(config.netdbFilename, "none") == 0)
+    if (strcmp(Config.netdbFilename, "none") == 0)
 	return;
 
     Logfile *lf;
@@ -488,7 +488,7 @@
     lf = logfileOpen(Config.netdbFilename, 4096, 0);
 
     if (NULL == lf) {
-        debugs(50, 1, "netdbSaveState: " << path << ": " << xstrerror());
+        debugs(50, 1, "netdbSaveState: " << Config.netdbFilename << ": " << xstrerror());
         return;
     }
 
@@ -529,7 +529,7 @@
 static void
 netdbReloadState(void)
 {
-    if (strcmp(config.netdbFilename, "none") == 0)
+    if (strcmp(Config.netdbFilename, "none") == 0)
 	return;
 
     char *s;