# HG changeset patch
# User carl
# Date 1160941306 25200
# Node ID 9b9bab1d3c21bfe9d4baa3aa534be74f594fa04b
# Parent  31ff00ea6bfb2a61df1a8085f80cf25f921a7fed
dump effective dnsbl_list with -c switch


diff -r 31ff00ea6bfb -r 9b9bab1d3c21 ChangeLog
--- a/ChangeLog	Sun Oct 15 12:23:17 2006 -0700
+++ b/ChangeLog	Sun Oct 15 12:41:46 2006 -0700
@@ -1,5 +1,9 @@
     $Id$
 
+5.25 2006-10-15
+    DNSBL lists are inherited, so dump the effective list with the
+    -c switch.
+
 5.24 2006-10-15
     Allow child and parent context to specify the same fully qualified
     env_to address. Only dump the rate limit for the default context
diff -r 31ff00ea6bfb -r 9b9bab1d3c21 NEWS
--- a/NEWS	Sun Oct 15 12:23:17 2006 -0700
+++ b/NEWS	Sun Oct 15 12:41:46 2006 -0700
@@ -1,7 +1,9 @@
     $Id$
 
+5.25 2006-10-15 Dump the effective dnsbl list with the -c switch
+5.24 2006-10-15 Allow child and parent context to specify the same fully qualified env_to address
 5.23 2006-10-10 Require two periods in ip addresses
-5.22 2006-09-27 Cleanup rate limit code.
+5.22 2006-09-27 Cleanup rate limit code
 5.21 2006-09-26 Add SMTP AUTH recipient rate limits
 5.20 2006-08-02 fully qualify all dns lookups; fix my_read() bug
 5.19 2006-08-01 uribl dnsl lookups fully qualified; allow two component host names; rpm properly creates user
diff -r 31ff00ea6bfb -r 9b9bab1d3c21 configure.in
--- a/configure.in	Sun Oct 15 12:23:17 2006 -0700
+++ b/configure.in	Sun Oct 15 12:41:46 2006 -0700
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dnsbl,5.24)
+AM_INIT_AUTOMAKE(dnsbl,5.25)
 AC_PATH_PROGS(BASH, bash)
 
 AC_LANG_CPLUSPLUS
diff -r 31ff00ea6bfb -r 9b9bab1d3c21 src/context.cpp
--- a/src/context.cpp	Sun Oct 15 12:23:17 2006 -0700
+++ b/src/context.cpp	Sun Oct 15 12:41:46 2006 -0700
@@ -705,9 +705,10 @@
 		printf("%s     dnsbl %s %s \"%s\"; \n", indent, n, d.suffix, d.message);
 	}
 
-	if (!dnsbl_list.empty()) {
+	dnsblp_list dl = get_dnsbl_list();
+	if (!dl.empty()) {
 		printf("%s     dnsbl_list", indent);
-		for (dnsblp_list::iterator i=dnsbl_list.begin(); i!=dnsbl_list.end(); i++) {
+		for (dnsblp_list::iterator i=dl.begin(); i!=dl.end(); i++) {
 			DNSBL &d = *(*i);
 			printf(" %s", d.name);
 		}