Merge branch 'filter-aaaa-on-v4-option' into 6.0-prerelease

2016-04-20 07:33:18 -05:00
parent 31cc2ada68 badd25b0e6
commit 4d2d2f63a8
3 changed files with 5 additions and 1 deletions
@@ -24,6 +24,9 @@ options {
 	auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;
 	listen-on-v6 { any; };
 	dnssec-enable <%= @dnssec ? 'yes' : 'no' %>;
+<%- if @filter_ipv6 -%>
+	filter-aaaa-on-v4 yes;
+<%- end -%>
 <%- if @dnssec -%>
 	dnssec-validation yes;
 	dnssec-lookaside auto;