diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-09-20 11:07:30 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-09-20 11:07:30 +0000 |
| commit | 19fe83500b7cd32d3a95b1d12fa62e324b70c170 (patch) | |
| tree | 0591c0f6d16d02497a2862732173b34dbabc99fd /bind-chroot-admin.in | |
| parent | 89803af2ce3848f1719a0bb330636949601ea2fa (diff) | |
| download | bind-19fe83500b7cd32d3a95b1d12fa62e324b70c170.tar.gz bind-19fe83500b7cd32d3a95b1d12fa62e324b70c170.tar.xz bind-19fe83500b7cd32d3a95b1d12fa62e324b70c170.zip | |
- build with O2bind-9_5_0-12_4_a6_fc8
- removed "autotools" patch
- bugfixing in bind-chroot-admin (#279901)
Diffstat (limited to 'bind-chroot-admin.in')
| -rw-r--r-- | bind-chroot-admin.in | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index d92b74b..8138269 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -217,10 +217,10 @@ function sync_files() changed=`/bin/mktemp /tmp/XXXXXX`; rm -f $changed if [ $ENABLED -eq 0 ] ; then # chroot is enabled - /usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 -type f | + /usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*,/dynamic/*}} /var/log/named.log -maxdepth 0 -type f | while read f; do - replace_with_link ${BIND_CHROOT_PREFIX}/$f $f; + replace_with_link ${BIND_CHROOT_PREFIX}$f $f; [ ! -e $changed ] && touch $changed; done; /usr/bin/find /etc/{named.*,rndc.*}.rpmsave ${BIND_DIR}/*.rpmsave -maxdepth 0 -type l 2>/dev/null | @@ -228,7 +228,6 @@ function sync_files() do /bin/rm -f $f >/dev/null 2>&1; done - ln -sf ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log pfx=${BIND_CHROOT_PREFIX} else # chroot is disabled /usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 | @@ -254,9 +253,12 @@ function sync_files() chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1; 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; + chown -h named:named /var/log/named.log >/dev/null 2>&1; + chown -h named:named ${BIND_CHROOT_PREFIX}/var/log/named.log >/dev/null 2>&1; chmod 750 ${pfx}/var/named >/dev/null 2>&1; chmod 640 ${pfx}/var/named/* >/dev/null 2>&1; chmod 750 ${pfx}/var/named/*/. >/dev/null 2>&1; + chmod 660 ${pfx}/var/log/named.log >/dev/null 2>&1; chown -h named:named /var/named/{data{,/*},slaves{,/*},dynamic{,/*}} >/dev/null 2>&1; chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/{data{,/*},slaves{,/*},dynamic{,/*}} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves,dynamic} >/dev/null 2>&1; @@ -264,18 +266,11 @@ function sync_files() chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1; if [ -e $changed ]; then if selinux_enabled && [ -x /sbin/restorecon ]; then - /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1; - if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then - /usr/bin/restorecon ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1; - fi; + /sbin/restorecon -R ${BIND_CHROOT_PREFIX} >/dev/null 2>&1; /sbin/restorecon /etc/named.* >/dev/null 2>&1; /sbin/restorecon /etc/rndc.key >/dev/null 2>&1; /sbin/restorecon /etc/rndc.conf >/dev/null 2>&1; - /sbin/restorecon /var/named{/,/*} >/dev/null 2>&1; - /sbin/restorecon /var/named/{slaves,data,dynamic}{/,/*} >/dev/null 2>&1; - /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca >/dev/null 2>&1; - /sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1; - /sbin/restorecon /var/named/named.ca >/dev/null 2>&1; + /sbin/restorecon -R /var/named >/dev/null 2>&1; fi; /sbin/service named try-restart rm -f $changed; |