use-bind9.16.diff: Fix some paths to what's in bind9 9.16.

debian/changelog

@@ -1,3 +1,9 @@
+freeipa (4.8.6-2) UNRELEASED; urgency=medium
+
+  * use-bind9.16.diff: Fix some paths to what's in bind9 9.16.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sat, 18 Apr 2020 10:39:18 +0300
+
 freeipa (4.8.6-1) unstable; urgency=medium
 
   * New upstream release.

debian/patches/series

@@ -7,3 +7,4 @@ write-out-only-one-cert-per-file.diff
 migrate-to-gpg.diff
 tasks-fixes.diff
 dnssec-race-wa.diff
+use-bind9.16.diff

debian/patches/use-bind9.16.diff

@@ -0,0 +1,24 @@
+--- a/ipaplatform/debian/paths.py
++++ b/ipaplatform/debian/paths.py
+@@ -58,7 +58,7 @@ class DebianPathNamespace(BasePathNamesp
+     SYSCONFIG_IPA_DNSKEYSYNCD = "/etc/default/ipa-dnskeysyncd"
+     SYSCONFIG_IPA_ODS_EXPORTER = "/etc/default/ipa-ods-exporter"
+     SYSCONFIG_KRB5KDC_DIR = "/etc/default/krb5-kdc"
+-    SYSCONFIG_NAMED = "/etc/default/bind9"
++    SYSCONFIG_NAMED = "/etc/default/named"
+     SYSCONFIG_NFS = "/etc/default/nfs-common"
+     SYSCONFIG_NTPD = "/etc/default/ntp"
+     SYSCONFIG_ODS = "/etc/default/opendnssec"
+--- a/ipaplatform/debian/services.py
++++ b/ipaplatform/debian/services.py
+@@ -23,8 +23,8 @@ debian_system_units = redhat_services.re
+ debian_system_units['httpd'] = 'apache2.service'
+ debian_system_units['kadmin'] = 'krb5-admin-server.service'
+ debian_system_units['krb5kdc'] = 'krb5-kdc.service'
+-debian_system_units['named-regular'] = 'bind9.service'
+-debian_system_units['named-pkcs11'] = 'bind9-pkcs11.service'
++debian_system_units['named-regular'] = 'named.service'
++debian_system_units['named-pkcs11'] = 'named-pkcs11.service'
+ debian_system_units['named'] = debian_system_units['named-pkcs11']
+ debian_system_units['pki-tomcatd'] = 'pki-tomcatd.service'
+ debian_system_units['pki_tomcatd'] = debian_system_units['pki-tomcatd']