hno squid-2.3.DEVEL3.squid.conf_template_update-4.patch [continuation]

Squid-2.3.DEVEL3: Major update of squid.conf template generation

There were some remains from that patch that didn't make it as part
of the previous commit (rejects which I forgot to merge manually)

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index bb7324cffea4e92edbb5cfc03bc5260a2f891e19..542caf0e0bfe85dd17f10177b90f9622f776faab 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.20 2000/05/02 20:58:30 hno Exp $
+ * $Id: dns_internal.cc,v 1.21 2000/05/02 21:04:01 hno Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -109,14 +109,12 @@ idnsAddNameserver(const char *buf)
     nns++;
 }
 
-#if UNUSED_CODE
 static void
 idnsFreeNameservers(void)
 {
     safe_free(nameservers);
     nns = nns_alloc = 0;
 }
-#endif
 
 static void
 idnsParseNameservers(void)

diff --git a/src/structs.h b/src/structs.h
index 74bddff7de88516874557c0c38bb4230339d3df7..da498ad74800b97cdffead6c25a249f5dfcbfa73 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.325 2000/05/02 20:58:30 hno Exp $
+ * $Id: structs.h,v 1.326 2000/05/02 21:04:01 hno Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -299,22 +299,28 @@ struct _SquidConfig {
        char *access;
        char *store;
        char *swap;
+#if USE_USERAGENT_LOG
        char *useragent;
+#endif
        int rotateNumber;
     } Log;
     char *adminEmail;
     char *effectiveUser;
     char *effectiveGroup;
     struct {
-#if USE_DNSSERVER
+#if USE_DNSSERVERS
        char *dnsserver;
 #endif
        wordlist *redirect;
        wordlist *authenticate;
+#if USE_ICMP
        char *pinger;
+#endif
+#if USE_UNLINKD
        char *unlinkd;
+#endif
     } Program;
-#if USE_DNSSERVER
+#if USE_DNSSERVERS
     int dnsChildren;
 #endif
     int redirectChildren;
@@ -381,7 +387,7 @@ struct _SquidConfig {
     } Netdb;
     struct {
        int log_udp;
-#if USE_DNSSERVER
+#if USE_DNSSERVERS
        int res_defnames;
 #endif
        int anonymizer;