IntenseWebs/freeipa
3
0 Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-10-31 17:17:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: fix the disable_dnssec_validation method

Browse Source 
Bind configuration now includes 2 snippet config files, in
/etc/named/ipa-ext.conf and /etc/named/ipa-options-ext.conf

When a test needs to disable dnssec-validation, it needs to edit
the snippet ipa-options-ext.conf instead of /etc/named.conf.

This commit fixes the method tasks.disable_dnssec_validation so that it
correctly updates the snippet.

Fixes: https://pagure.io/freeipa/issue/8364
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
This commit is contained in:
Florence Blanc-Renaud committed 2020-06-11 10:33:33 +02:00
1 parent 296ddcd32c
commit 1487665779
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
ipatests/pytest_ipa/integration/tasks.py
+6 -3
View File
@@ -531,11 +531,14 @@ def install_adtrust(host):
def disable_dnssec_validation(host):
backup_file(host, paths.NAMED_CONF)
named_conf = host.get_file_contents(paths.NAMED_CONF)
"""
Edits ipa-options-ext.conf snippet in order to disable dnssec validation
"""
backup_file(host, paths.NAMED_CUSTOM_OPTIONS_CONF)
named_conf = host.get_file_contents(paths.NAMED_CUSTOM_OPTIONS_CONF)
named_conf = re.sub(br'dnssec-validation\s*yes;', b'dnssec-validation no;',
named_conf)
host.put_file_contents(paths.NAMED_CONF, named_conf)
host.put_file_contents(paths.NAMED_CUSTOM_OPTIONS_CONF, named_conf)
restart_named(host)