aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2011-02-06 23:00:19 -0500
committerScott Ullrich <sullrich@pfsense.org>2011-02-06 23:00:19 -0500
commit66bb960cc19bd1bfa32f07843b878b38abc61472 (patch)
treee5453ea3c6961fce9cd561aee9c2a2b51a62711d
parent074ef28a68a38c696fd97448f3bdfaf9e6e92754 (diff)
downloadpfsense-packages-66bb960cc19bd1bfa32f07843b878b38abc61472.tar.gz
pfsense-packages-66bb960cc19bd1bfa32f07843b878b38abc61472.tar.bz2
pfsense-packages-66bb960cc19bd1bfa32f07843b878b38abc61472.zip
Strip colons from ipv6. Addresses must be in 128 but format
-rw-r--r--config/tinydns/tinydns.inc6
-rw-r--r--config/tinydns/tinydns.xml2
2 files changed, 3 insertions, 5 deletions
diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc
index 3159dcc0..501c019d 100644
--- a/config/tinydns/tinydns.inc
+++ b/config/tinydns/tinydns.inc
@@ -754,12 +754,10 @@ function tinydns_get_rowline_data($recordip, $recordtype, $ttl, $hostname, $rdns
break;
case "AAAA":
if($rdns) {
- // =fqdn:ip:ttl:timestamp:lo
$record_data = "^{$hostname}:{$recordip}{$ttl_string}";
} else {
- /* ":" creates "AAAA" records only to allow forward DNS */
- // :fqdn:ip:ttl:timestamp:lo
- $record_data = "6{$hostname}:{$recordip}{$ttl_string}";
+ $recip_san = str_replace(":", "", $recordip);
+ $record_data = "6{$hostname}:{$recip_san}{$ttl_string}";
}
break;
case "CNAME":
diff --git a/config/tinydns/tinydns.xml b/config/tinydns/tinydns.xml
index 68caf88f..9db401f8 100644
--- a/config/tinydns/tinydns.xml
+++ b/config/tinydns/tinydns.xml
@@ -161,7 +161,7 @@
<field>
<fielddescr>IP Address</fielddescr>
<fieldname>ipaddress</fieldname>
- <description>Bind TinyDNS to this IP address. This is the IP that will service DNS requests for this server. This IP cannot be used as a DNS server on client machines. Bind to 127.0.0.1 and use Port Forward entries to redirect DNS traffic internal or external to this resolver from multiple IPs. </description>
+ <description>Bind TinyDNS to this IP address. This is the IP that will service DNS requests for this server. This IP cannot be used as a DNS server on client machines. Bind to 127.0.0.1 and use Port Forward entries to redirect DNS traffic internal or external to this resolver from multiple IPs. You may also specify a pfSense alias which contains the IP addresses that we should bind to.</description>
<type>input</type>
</field>
<field>