1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-dnscache-1.0.0/root/var/service/dnscache/run mezzanine_patched_e-smith-dnscache-1.0.0/root/var/service/dnscache/run |
2 |
|
|
--- e-smith-dnscache-1.0.0/root/var/service/dnscache/run 2006-03-14 15:59:06.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_e-smith-dnscache-1.0.0/root/var/service/dnscache/run 2006-04-30 20:24:13.000000000 -0400 |
4 |
|
|
@@ -85,8 +85,13 @@ |
5 |
|
|
my $mask = $net->prop('Mask'); |
6 |
|
|
my $key = $net->key; |
7 |
|
|
my $systemlocalnetwork = $net->prop('SystemLocalNetwork') || 'no'; |
8 |
|
|
- my $nameserver = $net->prop('NameServer') || |
9 |
|
|
- (($systemlocalnetwork eq 'yes') ? $tinydns_ip : 'none'); |
10 |
|
|
+ my $nameserver = $net->prop('NameServer'); |
11 |
|
|
+ if (defined $nameserver and $nameserver eq $ENV{IP}) |
12 |
|
|
+ { |
13 |
|
|
+ warn("NameServer property for net $key ($nameserver) would create loop - ignoring\n"); |
14 |
|
|
+ $nameserver = undef; |
15 |
|
|
+ } |
16 |
|
|
+ $nameserver ||= ($systemlocalnetwork eq 'yes') ? $tinydns_ip : 'none'; |
17 |
|
|
push @localnetworks, |
18 |
|
|
esmith::util::computeAllLocalNetworkPrefixes ($key, $mask); |
19 |
|
|
|