Upgrade to 9.3.1rc1. Add SDB support. fix bugs 147824 / 147073 / 145664.

1 files changed, 18 insertions, 2 deletions

diff --git a/named.init b/named.init
index e9d3b93..5cbda73 100755
--- a/named.init
+++ b/named.init
@@ -42,9 +42,10 @@ start() {
 		    cp -fp /etc/localtime ${ROOTDIR}/etc/localtime
 		fi;
 	fi
+	no_write_master_zones=0
 	if [ -e /etc/selinux/config ]; then
            .  /etc/selinux/config
-           if [ "$SELINUXTYPE" != "" ] && [ -d /etc/selinux/${SELINUXTYPE} ] && [ -e /etc/selinux/${SELINUXTYPE}/booleans  ]; then
+           if [ "$SELINUX" != 'disabled' ] && [ "$SELINUXTYPE" != "" ] && [ -d /etc/selinux/${SELINUXTYPE} ] && [ -e /etc/selinux/${SELINUXTYPE}/booleans  ]; then
 	       . /etc/selinux/${SELINUXTYPE}/booleans 
 	       if echo "$named_write_master_zones" | /bin/egrep -q '^[0-9]+$'; then
 		   if [ "$named_write_master_zones" -eq 1 ] ; then
@@ -53,16 +54,31 @@ start() {
 		       /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 ] && /usr/sbin/named-checkconf $ckcf_options; then
            conf_ok=1;
         else
 	   RETVAL=$?;
 	fi
+	PROG=named
+	if [[ "$ENABLE_SDB" = [yY1]* ]] && [ -x /usr/sbin/named_sdb ]; then
+	    PROG=named_sdb;
+	fi;
 	if [ $conf_ok -eq 1 ]; then	   
-	   daemon /usr/sbin/named -u named ${OPTIONS};
+	   daemon /usr/sbin/$PROG -u named ${OPTIONS};
 	   RETVAL=$?;
 	else
 	   named_err=`/usr/sbin/named -g 2>&1 | sed s/\n/\\n/g`;