Fix ip acls with SPLAY trees

diff --git a/src/acl.cc b/src/acl.cc
index 93073626d1d8e9a3be8ba3d9c42a4fc78092a437..c91913db76f30f0eead861f728ec14b937b57cc3 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.161 1998/04/22 16:24:12 rousskov Exp $
+ * $Id: acl.cc,v 1.162 1998/04/23 22:51:04 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -62,7 +62,9 @@ static wordlist *aclDumpDomainList(void *data);
 static wordlist *aclDumpTimeSpecList(acl_time_data *);
 static wordlist *aclDumpRegexList(relist * data);
 static wordlist *aclDumpIntlistList(intlist * data);
+#ifndef USE_SPLAY_TREE
 static wordlist *aclDumpWordList(wordlist * data);
+#endif
 static wordlist *aclDumpProtoList(intlist * data);
 static wordlist *aclDumpMethodList(intlist * data);
 static wordlist *aclDumpProxyAuthList(acl_proxy_auth * data);
@@ -2023,6 +2025,7 @@ aclDumpIntlistList(intlist * data)
     return W;
 }
 
+#ifndef USE_SPLAY_TREE
 static wordlist *
 aclDumpWordList(wordlist * data)
 {
@@ -2038,6 +2041,7 @@ aclDumpWordList(wordlist * data)
     }
     return W;
 }
+#endif
 
 static wordlist *
 aclDumpProtoList(intlist * data)

diff --git a/src/structs.h b/src/structs.h
index 08368059b379f0ff8c74aa19d49acd39456b75fb..2195b00f6250f9801b2a8a86e8e6c2d74f99f559 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -3,9 +3,7 @@ struct _acl_ip_data {
     struct in_addr addr1;      /* if addr2 non-zero then its a range */
     struct in_addr addr2;
     struct in_addr mask;
-#ifndef USE_SPLAY_TREE
     acl_ip_data *next;
-#endif
 };
 
 struct _acl_snmp_comm {