- removed statement from initscript which passes -D to namedbind-9_5_0-18_a7_fc8

3 files changed, 5 insertions, 23 deletions

diff --git a/bind.spec b/bind.spec
index 325f41c..4e91a75 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	17.%{RELEASEVER}%{?dist}
+Release: 	18.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -412,7 +412,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.227 2007/11/15 11:51:33 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.228 2007/11/19 14:25:07 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -663,6 +663,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Nov 19 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.a7
+- removed statement from initscript which passes -D to named
+
 * Thu Nov 15 2007 Adam Tkac <atkac redhat com> 32:9.5.0-17.a7
 - 9.5.0a7
 - dropped patches (upstream)
diff --git a/named.init b/named.init
index a3498c1..e84f1af 100755
--- a/named.init
+++ b/named.init
@@ -42,22 +42,6 @@ if [ -n "$ROOTDIR" ]; then
    fi;
 fi
 
-# Manage forwarders through D-BUS?
-for a in $OPTIONS; do
-  if [ $a  = "-D" ]; then
-    dbusEnabled=1;
-  fi;
-done
-
-if [ -z $dbusEnabled ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
-  for l in 0 1 2 3 4 5 6; do
-    if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then
-      dbusEnabled=1;
-    fi;
-  done
-  [ -z $dbusEnabled ] || OPTIONS="$OPTIONS -D";
-fi;
-
 # Check if all what named needs running
 start()
 {
diff --git a/named.sysconfig b/named.sysconfig
index 622b691..421dfa1 100644
--- a/named.sysconfig
+++ b/named.sysconfig
@@ -10,9 +10,4 @@
 # OPTIONS="whatever"     --  These additional options will be passed to named
 #                            at startup. Don't add -t here, use ROOTDIR instead.
 #
-# DISABLE_NAMED_DBUS=[1y]--  If NetworkManager is enabled in any runlevel, then 
-# 			     the initscript will by default enable named's D-BUS
-#			     support with the named -D option. This setting disables
-#			     this behavior.
-#
 # KEYTAB_FILE="/dir/file"    --  Specify named service keytab file (for GSS-TSIG)