rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

fix bug 188382; deal with redundant .rpmsave links; prevent redundant

Browse Source 
backups
This commit is contained in:
jvdias 2006-04-18 23:54:14 +00:00
parent 80c7ce2179
commit d74c490fb8
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bind-chroot-admin.in
View File

@ -67,7 +67,10 @@ function check_dirs()
if [ -L "$BIND_CHROOT_PREFIX" ]; then if [ -L "$BIND_CHROOT_PREFIX" ]; then
BIND_CHROOT_PREFIX=`/usr/bin/readlink "$BIND_CHROOT_PREFIX"`; BIND_CHROOT_PREFIX=`/usr/bin/readlink "$BIND_CHROOT_PREFIX"`;
fi fi
if [ -e /etc/sysconfig/named ]; then
/bin/chown root:named /etc/sysconfig/named;
/bin/chmod 0640 /etc/sysconfig/named;
fi
/bin/mkdir -p ${BIND_DIR}/{slaves,data}; /bin/mkdir -p ${BIND_DIR}/{slaves,data};
/bin/chown root:named ${BIND_DIR}; /bin/chown root:named ${BIND_DIR};
/bin/chown named:named ${BIND_DIR}/{slaves,data}; /bin/chown named:named ${BIND_DIR}/{slaves,data};
@ -84,7 +87,8 @@ function check_dirs()
[ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5 [ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5
[ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3 [ ! -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"; [ ! -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}; chown root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
chmod 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
if [ -d /selinux ] && [ -e /selinux/enforce ] && [ -x /usr/bin/chcon ]; then if [ -d /selinux ] && [ -e /selinux/enforce ] && [ -x /usr/bin/chcon ]; then
for dev in random zero null; do for dev in random zero null; do
/usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev; /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
@ -121,7 +125,7 @@ function replace_with_link()
fi fi
if [ -e "$dst" ]; then if [ -e "$dst" ]; then
if [ ! -L "$dst" ]; then if [ ! -L "$dst" ]; then
if [ ! -s "$dst" ]; then if [ ! -s "$dst" ] || /usr/bin/cmp "$dst" "$src" > /dev/null 2>&1; then
/bin/rm -f "$dst"; /bin/rm -f "$dst";
else else
if [ "$src" -nt "$dst" ] || [ ! "$dst" -nt "$src" ] ; then if [ "$src" -nt "$dst" ] || [ ! "$dst" -nt "$src" ] ; then
@ -135,6 +139,7 @@ function replace_with_link()
dstlnk=`/usr/bin/readlink "$dst"` dstlnk=`/usr/bin/readlink "$dst"`
if [ "$dstlnk" != $src ]; then if [ "$dstlnk" != $src ]; then
/bin/rm -f $dst; /bin/rm -f $dst;
if ! /usr/bin/cmp "$dstlnk" "$src" > /dev/null 2>&1; then
if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then
if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then
/bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`; /bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`;
@ -143,6 +148,7 @@ function replace_with_link()
/bin/cp -fp "$dstlnk" "$src"; /bin/cp -fp "$dstlnk" "$src";
fi; fi;
fi; fi;
fi;
else else
return 0; return 0;
fi; fi;
@ -207,6 +213,11 @@ function sync_files()
replace_with_link ${BIND_CHROOT_PREFIX}/$f $f; replace_with_link ${BIND_CHROOT_PREFIX}/$f $f;
[ ! -e $changed ] && touch $changed; [ ! -e $changed ] && touch $changed;
done; done;
/usr/bin/find /etc/{named.*,rndc.*}.rpmsave ${BIND_DIR}/*.rpmsave -maxdepth 0 -type l 2>/dev/null |
while read f;
do
/bin/rm -f $f >/dev/null 2>&1;
done
pfx=${BIND_CHROOT_PREFIX} pfx=${BIND_CHROOT_PREFIX}
else # chroot is disabled else # chroot is disabled
/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*}} -maxdepth 0 | /usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*}} -maxdepth 0 |
@ -226,26 +237,31 @@ function sync_files()
elif /bin/egrep -q '@KEY@' /etc/rndc.key; then elif /bin/egrep -q '@KEY@' /etc/rndc.key; then
/bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ; /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
fi fi
chown root:named ${pfx}/var/named/* >/dev/null 2>&1; chown -h root:named /var/named/* >/dev/null 2>&1;
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;
chmod 750 ${pfx}/var/named >/dev/null 2>&1; chmod 750 ${pfx}/var/named >/dev/null 2>&1;
chmod 640 ${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 750 ${pfx}/var/named/*/. >/dev/null 2>&1;
chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1; chown -h named:named /var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1;
chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1;
chmod 660 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; chmod 660 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.} >/dev/null 2>&1;
if [ -e $changed ]; then if [ -e $changed ]; then
if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then
if [ -n "$pfx" ]; then /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
/sbin/restorecon -R $pfx/etc $pfx/var/named $pfx/var/run/named >/dev/null 2>&1; if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then
if [ -e $pfx/etc/localtime ] && [ -e /etc/localtime ] ; then /usr/bin/chcon --reference=/etc/localtime ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
/usr/bin/chcon --reference=/etc/localtime $pfx/etc/localtime >/dev/null 2>&1;
fi;
else
/sbin/restorecon /etc/{named,rndc}.* >/dev/null 2>&1;
/usr/bin/chcon --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1;
/sbin/restorecon -e /var/named/chroot /var/named{/,/data/,/slaves/}* >/dev/null 2>&1;
fi; fi;
/usr/bin/chcon -h --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1;
/usr/bin/chcon -h --reference=/etc/rndc.key /etc/rndc.key >/dev/null 2>&1;
/usr/bin/chcon -h --reference=/etc/rndc.conf /etc/rndc.conf >/dev/null 2>&1;
/usr/bin/chcon -h --reference=/var/named /var/named{/,/*} >/dev/null 2>&1;
/usr/bin/chcon -h --reference=/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
/sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca >/dev/null 2>&1;
/usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1;
fi; fi;
/sbin/service named condrestart /sbin/service named condrestart
rm -f $changed; rm -f $changed;