From b51a1f40e48a99d3ce69b8d780b2018cd0d53234 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Wed, 27 Jan 2010 15:19:02 +0000
Subject: [PATCH] - revert the "DEBUG" feature (#510283), it causes too many
 problems     (#545128)

---
 bind.spec       |  5 ++++-
 named.init      | 15 ---------------
 named.sysconfig |  9 ---------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/bind.spec b/bind.spec
index 102a8ae..923fe57 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.10.%{PREVER}%{?dist}
+Release:  0.11.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -621,6 +621,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Jan 27 2010 Adam Tkac <atkac redhat com> 32:9.7.0-0.11.rc1
+- revert the "DEBUG" feature (#510283), it causes too many problems (#545128)
+
 * Tue Dec 15 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.10.rc1
 - update to 9.7.0rc1
 - bind97-headers.patch merged
diff --git a/named.init b/named.init
index 12540a2..5694427 100755
--- a/named.init
+++ b/named.init
@@ -47,21 +47,6 @@ fi
   [ /etc/sysconfig/dnssec -nt /etc/named.conf ] && \
    /usr/sbin/dnssec-configure -b --norestart --dnssec="$DNSSEC" --dlv="$DLV"
 
-# Enable/disable debugging
-if [ "x$DEBUG" = 'xyes' ]; then
-  chown named.named /var/named
-  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'off' ]; then
-      setsebool named_write_master_zones 1
-  fi;
-else
-  chown root.named /var/named
-  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'on' ]; then
-      setsebool named_write_master_zones 0
-  fi;
-fi
-
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
 /etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key
 /usr/lib64/bind /usr/lib/bind'
diff --git a/named.sysconfig b/named.sysconfig
index d503526..53b6a1b 100644
--- a/named.sysconfig
+++ b/named.sysconfig
@@ -31,12 +31,3 @@
 #                            at startup. Don't add -t here, use ROOTDIR instead.
 #
 # KEYTAB_FILE="/dir/file"    --  Specify named service keytab file (for GSS-TSIG)
-#
-# DEBUG="yes|no"         -- This option controls if you would like to debug
-# 			    named process. If you set this option to "yes" then
-# 			    /var/named/ directory become writable by named user
-# 			    and named will be able to write core dumps there.
-#
-# OPTIONS="-E pkcs11"    -- Enable loading of DNSSEC keys from PKCS11 compatible
-#			    keystores. Make sure you have bind-pkcs11 package
-#			    installed.