rpms/bind/F-8 bind.spec, 1.227, 1.228 named.init, 1.60, 1.61 named.sysconfig, 1.7, 1.8

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10327

Modified Files:
	bind.spec named.init named.sysconfig 
Log Message:
- removed statement from initscript which passes -D to named



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- bind.spec	15 Nov 2007 11:51:33 -0000	1.227
+++ bind.spec	19 Nov 2007 14:25:07 -0000	1.228
@@ -21,7 +21,7 @@
 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)
@@ -663,6 +663,9 @@
 %{_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)


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/named.init,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- named.init	15 Nov 2007 10:50:41 -0000	1.60
+++ named.init	19 Nov 2007 14:25:07 -0000	1.61
@@ -42,22 +42,6 @@
    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()
 {


Index: named.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/named.sysconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- named.sysconfig	23 Aug 2007 09:09:35 -0000	1.7
+++ named.sysconfig	19 Nov 2007 14:25:07 -0000	1.8
@@ -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)