diff -Nur -x '*.orig' -x '*.rej' smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from --- smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from 2006-08-24 06:48:48.000000000 -0400 +++ mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from 2006-08-24 06:48:29.000000000 -0400 @@ -1,6 +1,12 @@ { my $ndb = esmith::NetworksDB->open_ro; my @locals = $ndb->local_access_spec(); - $OUT = "allow_from="; - $OUT .= join(',', @locals); + $OUT = "allow-from="; + $OUT .= join(',', + map { + my ($n, $m) = split('/'); + $m ||= '255.255.255.255'; + ($m eq '255.255.255.255') ? $n : + esmith::util::computeLocalNetworkShortSpec($n, $m); + } @locals); } diff -Nur -x '*.orig' -x '*.rej' smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones --- smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones 2006-08-24 06:48:48.000000000 -0400 +++ mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones 2006-08-24 06:29:30.000000000 -0400 @@ -3,14 +3,20 @@ my $ddb = esmith::DomainsDB->open_ro; use esmith::NetworksDB; my $ndb = esmith::NetworksDB->open_ro; - my $tinydns_ip = $tinydns{'ListenIP'} || "127.0.0.1"; + my $tinydns_ip = $tinydns{'ListenIP'} || "127.0.0.1"; my @delegations = map { - $_->key . "=" . ($_->prop('Nameserver') || $tinydns_ip) + $_->key . "=" . ($_->prop('Nameserver') || $tinydns_ip) } $ddb->domains; my @reverse_delegations = map { - $_->key . "=" . ($_->prop('Nameservers') || $tinydns_ip) - } $ndb->domains; + my $key = $_->key; + my $mask = $_->prop('Mask'); + my $nameserver = $_->prop('Nameservers') || $tinydns_ip; + my $reverse = esmith::util::computeLocalNetworkReversed ($key, $mask); + # Remove the trailing period provided by computeLocalNetworkReversed + $reverse =~ s/\.$//; + "$reverse=$nameserver" + } $ndb->networks; $OUT = "forward-zones=" . join(',', @delegations, @reverse_delegations); diff -Nur -x '*.orig' -x '*.rej' smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run --- smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run 2006-08-24 06:48:48.000000000 -0400 +++ mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run 2006-08-24 02:53:52.000000000 -0400 @@ -1,3 +1,3 @@ #! /bin/sh -exec pdns_recursor --daemon=no +exec pdns_recursor --daemon=no --config-dir=$(pwd)