X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkconf.m4;h=eedde55b1e3119cf83e6db6f2e5981c0d5c08acf;hb=0f28cfaa52b633c4a0217345731973565b6ea897;hp=25fc1eb2e93d4c0a3aab61edb5303ce15c7f9e4d;hpb=a04eabf4469be6440ccf8d1780da911728c6fb2b;p=nsc-5.git

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 25fc1eb..eedde55 100644
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -31,15 +31,35 @@ divert(-1)')
 # Definition of forwarders for both normal and slave mode
 
 define(`FORWard', `patsubst(`$*',`,',`; ')')
-define(`FORWArd', `divert(0)	forward $1;
+define(`FORWArd', `	forward $1;
 	forwarders { FORWard(shift($@),)};
-divert(-1)')
+')
 
 define(`FORWARD', `FORWArd(first, $@)')
 define(`SLAVE', `FORWArd(only, $@)')
 
 divert(-1)')
 
+# Definition of a forwarding zone
+
+define(`FORWARDING', `divert(0)zone "$1" in {
+	type forward;
+	forward only;
+	forwarders { FORWard(shift($@),)};
+ZZ_OPTIONS()dnl
+};
+
+divert(-1)')
+
+# Blackhole zones
+
+define(`BLACKHOLE', `divert(0)zone "$1" in {
+	type master;
+	file "cf/blackhole";
+};
+
+divert(-1)')
+
 # Manual insertion of config file material
 
 define(`CONFIG', `divert(0)$1