From c76f58f6ea20c85c610be833f8043e57ae0adfe5 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Nov 04 2015 16:34:38 +0000
Subject: Fixed named-checkconf call in *-chroot.service files (#1277820)


Signed-off-by: Tomas Hozza <thozza@redhat.com>

---

diff --git a/bind.spec b/bind.spec
index 3b73449..47fafdb 100644
--- a/bind.spec
+++ b/bind.spec
@@ -24,7 +24,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.10.3
-Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -993,6 +993,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Nov 04 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.3-2
+- Fixed named-checkconf call in *-chroot.service files (#1277820)
+
 * Thu Sep 17 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.3-1
 - Update to 9.10.3 stable
 
diff --git a/named-chroot.service b/named-chroot.service
index 45d15e1..87d6b7b 100644
--- a/named-chroot.service
+++ b/named-chroot.service
@@ -17,7 +17,7 @@ EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
 PIDFile=/var/named/chroot/run/named/named.pid
 
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi'
+ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -t /var/named/chroot -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi'
 ExecStart=/usr/sbin/named -u named -t /var/named/chroot $OPTIONS
 
 ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID'
diff --git a/named-sdb-chroot.service b/named-sdb-chroot.service
index 121f54d..347b43c 100644
--- a/named-sdb-chroot.service
+++ b/named-sdb-chroot.service
@@ -17,7 +17,7 @@ EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
 PIDFile=/var/named/chroot_sdb/run/named/named.pid
 
-ExecStartPre=/usr/sbin/named-checkconf -t /var/named/chroot_sdb -z /etc/named.conf
+ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -t /var/named/chroot_sdb -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi'
 ExecStart=/usr/sbin/named-sdb -u named -t /var/named/chroot_sdb $OPTIONS
 
 ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID'