From: Peter Pramberger <peter@pramberger.at>
Date: Thu, 22 Sep 2011 00:46:26 +0000 (-0600)
Subject: Bug 3355: configure setting --with-swapdir ignored by netdb
X-Git-Tag: BumpSslServerFirst.take01~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=221faecbff948f0acfc2e53379cf64394fb111fd;p=thirdparty%2Fsquid.git

Bug 3355: configure setting --with-swapdir ignored by netdb
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 22c1a30d61..a794717266 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -843,7 +843,6 @@ DEFAULT_CACHE_LOG	= $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG	= $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG	= $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_NETDB_FILE	= $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR	= $(localstatedir)/cache
 DEFAULT_SSL_DB_DIR	= $(localstatedir)/lib/ssl_db
 DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 95842e7dac..b33283a2cd 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -3446,7 +3446,7 @@ DOC_END
 
 NAME: netdb_filename
 TYPE: string
-DEFAULT: @DEFAULT_NETDB_FILE@
+DEFAULT: stdio:@DEFAULT_NETDB_FILE@
 LOC: Config.netdbFilename
 IFDEF: USE_ICMP
 DOC_START