summaryrefslogtreecommitdiffstats
path: root/bind-chroot-admin.in
diff options
context:
space:
mode:
authorjvdias <jvdias@fedoraproject.org>2006-03-08 18:17:55 +0000
committerjvdias <jvdias@fedoraproject.org>2006-03-08 18:17:55 +0000
commitf0ac1e0c6b7b4eb2743059267f2ab1de1b4c505e (patch)
treefe0d436cf168d9262d759497cf0e517577eea937 /bind-chroot-admin.in
parent9b6c1508e7ae079f692e93cf85e41adda68c78eb (diff)
- Do not allow package to be installed if named:25 userid creation fails
- Give libbind a pkg-config file - remove restorecon from bind-chroot-admin (not required). - fix named.caching-nameserver.conf (listen-on-v6 port 53 { ::1 };)
Diffstat (limited to 'bind-chroot-admin.in')
-rw-r--r--bind-chroot-admin.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in
index 987e249..1bb3e1b 100644
--- a/bind-chroot-admin.in
+++ b/bind-chroot-admin.in
@@ -85,7 +85,7 @@ function check_dirs()
[ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3
[ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] && [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
chmod 666 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
- if [ -d /selinux ] && [ -x /usr/bin/chcon ]; then
+ if [ -d /selinux ] && [ -e /selinux/enforce ] && [ -x /usr/bin/chcon ]; then
for dev in random zero null; do
/usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
done
@@ -222,8 +222,7 @@ function sync_files()
chmod 640 ${pfx}/var/named/* >/dev/null 2>&1;
chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1;
- chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
- [ -x /sbin/restorecon ] && /sbin/restorecon -R $pfx{/var/named,/etc/{named,rndc}.*} -e ${BIND_CHROOT_PREFIX}/proc -e ${BIND_CHROOT_PREFIX}/var/run/dbus -e ${BIND_CHROOT_PREFIX}/dev >/dev/null 2>&1;
+ chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
}
case $1 in