diff options
| author | jvdias <jvdias@fedoraproject.org> | 2006-07-21 20:36:45 +0000 |
|---|---|---|
| committer | jvdias <jvdias@fedoraproject.org> | 2006-07-21 20:36:45 +0000 |
| commit | 49eb4b9677787d1a8bd58624c48577f6a64475c3 (patch) | |
| tree | c06bea317528cce072ab107de6e23af8cccde4db | |
| parent | 6fcc997885b39c533b24387a84458d3022a044c1 (diff) | |
| download | bind-9_3_2-32_fc6.tar.gz bind-9_3_2-32_fc6.tar.xz bind-9_3_2-32_fc6.zip | |
fix addenda to bugs 189789, 196398bind-9_3_2-32_fc6
| -rw-r--r-- | bind-chroot-admin.in | 5 | ||||
| -rw-r--r-- | bind.spec | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index 9395c6e..e748d99 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -52,10 +52,7 @@ function rootdir() function selinux_enabled() { - [ -e /etc/selinux/config ] && . /etc/selinux/config; - if [ -n "$SELINUX" ] && [ "$SELINUX" != 'disabled' ] ; then - return 0; - fi; + while read d mp fs rest; do if [ "$fs" = "selinuxfs" ]; then return 0; fi; done < /proc/mounts return 1; } @@ -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: 30%{?dist} +Release: 32%{?dist} Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -844,6 +844,14 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Fri Jul 21 2006 Jason Vas Dias <jvdias@redhat.com> - 30:9.3.2-32 +- fix addenda to bug 189789: + determination of selinux enabled was still not 100% correct in bind-chroot-admin +- fix addenda to bug 196398: + make named.init test for NetworkManager being enabled AFTER testing for -D absence; + named.init now supports a 'DISABLE_NAMED_DBUS' /etc/sysconfig/named setting to disable + auto-enable of named dbus support if NetworkManager enabled. + * 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. |