fix bug 196398; fix namedGetForwarders for new dbus

3 files changed, 30 insertions, 9 deletions

diff --git a/bind.spec b/bind.spec
index b66825e..d9e1e8c 100644
--- a/bind.spec
+++ b/bind.spec
@@ -17,7 +17,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	28.FC6
+Release: 	30%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -609,6 +609,7 @@ exit 0
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
 %{_libdir}/liblwres.a
+%exclude %{_libdir}/libbind.so
 %{_libdir}/*so
 %{_includedir}/bind9
 %{_includedir}/dns
@@ -675,6 +676,7 @@ exit 0
 %{_libdir}/libbind.so*
 %defattr(0644,root,root,0755) 
 %{_libdir}/libbind.a
+%{_libdir}/libbind.so
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*
@@ -843,6 +845,11 @@ rm -rf ${RPM_BUILD_ROOT}
 :;
 
 %changelog
+* Wed Jul 19 2006 Jason Vas Dias <jvdias@redhat.com> - 30:9.3.2-30
+- fix bug 196398 - Enable -D option automatically in initscript
+  if NetworkManager enabled in any runlevel.
+- fix namedGetForwarders for new dbus
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen@redhat.com> - 30:9.3.2-28.FC6
 - Rebuild against new dbus
 
diff --git a/named.init b/named.init
index 5979703..b3e0881 100755
--- a/named.init
+++ b/named.init
@@ -60,9 +60,29 @@ if [ ! -r ${ROOTDIR}${named_conf} ] ; then
        echo Locating $ROOTDIR/${named_conf} failed:
        failure
        echo;
+       exit 1;
    fi;
 fi;
 
+NetworkManagerEnabled=0
+for l in 0 1 2 3 4 5 6; do 
+    if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
+	NetworkManagerEnabled=1; 
+    fi; 
+done
+
+dbusEnabled=0;
+for a in $OPTIONS; do
+    if [ $a  = "-D" ]; then
+	dbusEnabled=1;
+    fi;
+done
+
+if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then
+   OPTIONS="$OPTIONS -D";
+   dbusEnabled=1;
+fi
+
 start() {
         # Start daemons.
         echo -n $"Starting $named: "
@@ -85,13 +105,7 @@ start() {
 		if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
 		    mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 
 		fi
-		dbus=0;
-		for a in $OPTIONS; do
-		    if [ $a  = "-D" ]; then
-			dbus=1;
-	            fi;
-	        done
-		if [ $dbus -eq 1 ]; then
+		if [ $dbusEnabled -eq 1 ]; then
 		    if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
 			mkdir -p ${ROOTDIR}/var/run/dbus
 			if [ ! -d  /var/run/dbus ] ; then
diff --git a/namedGetForwarders b/namedGetForwarders
index 8ddf837..4646e03 100755
--- a/namedGetForwarders
+++ b/namedGetForwarders
@@ -42,7 +42,7 @@ if ( $#ARGV >= 0 )
 @dn=(); 
 
 open(DNS,
-     '/usr/bin/dbus-send --system --type=method_call --print-reply --reply-timeout=20000 '
+     '/bin/dbus-send --system --type=method_call --print-reply --reply-timeout=20000 '
     .'--dest=com.redhat.named /com/redhat/named com.redhat.named.text.GetForwarders '
     .$zone .'|'
     ) || die("dbus-send failed: $?: $!");