From 1d6a8ca7c859fb28e5aac4ad1d2be784c8f66f2d Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 4 Jun 2007 13:44:35 +0000 Subject: - very minor compatibility change in bind-chroot-admin (line 215) - enabled IDN support by default and don't distribute IDN libraries (#169546) - specfile cleanup - add dynamic directory to /var/named. This directory will be primarily used for dynamic DNS zones. ENABLE_ZONE_WRITE and SELinux's named_write_master_zones no longer exist --- named.init | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'named.init') diff --git a/named.init b/named.init index f801da8..06c0561 100755 --- a/named.init +++ b/named.init @@ -121,35 +121,7 @@ start() { fi; fi; fi - no_write_master_zones=0 - if [ -e /etc/selinux/config ]; then - . /etc/selinux/config - if [[ ( "$SELINUX" != 'disabled') && ("$SELINUXTYPE" != "") && (-d /etc/selinux/${SELINUXTYPE}) && (-e /etc/selinux/${SELINUXTYPE}/booleans || (-e /etc/selinux/${SELINUXTYPE}/booleans.local)) ]]; then - if [ -e /etc/selinux/${SELINUXTYPE}/booleans.local ]; then - . /etc/selinux/${SELINUXTYPE}/booleans.local; - else - . /etc/selinux/${SELINUXTYPE}/booleans; - fi; - if echo "$named_write_master_zones" | /bin/egrep -q '^[0-9]+$'; then - if [ "$named_write_master_zones" -eq 1 ] ; then - /bin/chown -f --from=root:named named:named $ROOTDIR/var/named - elif [ "$named_write_master_zones" -eq 0 ] ; then - /bin/chown -f --from=named:named root:named $ROOTDIR/var/named - fi; - fi; - else - no_write_master_zones=1 - fi; - else - no_write_master_zones=1 - fi; - if [ "$no_write_master_zones" -eq 1 ]; then - if [[ "$ENABLE_ZONE_WRITE" = [yY1]* ]]; then - /bin/chown -f --from=root:named named:named $ROOTDIR/var/named - elif [[ "$ENABLE_ZONE_WRITE" = [nN0]* ]]; then - /bin/chown -f --from=named:named root:named $ROOTDIR/var/named - fi; - fi + conf_ok=0; if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then conf_ok=1; -- cgit