Attachment 154200 Details for Bug 239149 – proposed patch -- fix selinux_enabled and also fix chown'ing

[patch] proposed patch -- fix selinux_enabled and also fix chown'ing

bind-chroot-admin-zone-write.patch (text/plain), 1.96 KB, created by Jeff Layton on 2007-05-05 12:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-05-05 12:47:42 UTC

Size: 1.96 KB

patch

obsolete

>Index: bind-chroot-admin.in
>===================================================================
>RCS file: /cvs/extras/rpms/bind/devel/bind-chroot-admin.in,v
>retrieving revision 1.20
>diff -u -p -r1.20 bind-chroot-admin.in
>--- bind-chroot-admin.in	27 Apr 2007 13:59:11 -0000	1.20
>+++ bind-chroot-admin.in	5 May 2007 12:40:36 -0000
>@@ -56,10 +56,10 @@ function selinux_enabled()
>     if [ -x /usr/sbin/selinuxenabled ]; then
>       /usr/sbin/selinuxenabled;
>       if [ $? -eq 0 ]; then
>-        return 1;
>+        return 0;
>       fi;
>     fi;
>-    return 0;
>+    return 1;
> }
> 
> function check_dirs()
>@@ -209,6 +209,27 @@ function disable_bind_chroot()
>     /bin/sed -i -e '/^ROOTDIR=/d' /etc/sysconfig/named;
> }
> 
>+function master_zone_writes_enabled()
>+{
>+    if selinux_enabled; then
>+	if [ -x /usr/sbin/getsebool ]; then
>+	    named_write_master_zones=`/usr/sbin/getsebool named_write_master_zones | cut -d' ' -f3`
>+	    if [ $named_write_master_zones == "on" ]; then
>+		return 0;
>+	    else
>+		return 1;
>+	    fi
>+	fi
>+    fi
>+
>+    . /etc/sysconfig/named
>+    if [[ "$ENABLE_ZONE_WRITE" =  [yY1]* ]]; then
>+	return 0
>+    fi
>+
>+    return 1
>+}
>+
> function sync_files()
> {
>     rootdir;
>@@ -249,8 +270,13 @@ function sync_files()
>     elif /bin/egrep -q '@KEY@' /etc/rndc.key; then
> 	/bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
>     fi    
>-    chown -h root:named /var/named/* >/dev/null 2>&1;
>-    chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
>+    if master_zone_writes_enabled; then
>+	chown -h named:named /var/named/* >/dev/null 2>&1;
>+	chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
>+    else
>+	chown -h root:named /var/named/* >/dev/null 2>&1;
>+	chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
>+    fi
>     chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1;
>     chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1;
>     chmod 750 ${pfx}/var/named  >/dev/null 2>&1;

Actions: View | Diff

Attachments on bug 239149: 154199 | 154200