diff options
| author | Martin Stransky <stransky@fedoraproject.org> | 2006-11-21 16:33:52 +0000 |
|---|---|---|
| committer | Martin Stransky <stransky@fedoraproject.org> | 2006-11-21 16:33:52 +0000 |
| commit | 0d4d38e853df420c67c08be272ec7456e7efea19 (patch) | |
| tree | 47faef20b07455fa0786ba8a3702a3bbb20f239e | |
| parent | 61a46ae5d26c5b3215ec17d680eb4c0dfebdc27c (diff) | |
| download | bind-0d4d38e853df420c67c08be272ec7456e7efea19.tar.gz bind-0d4d38e853df420c67c08be272ec7456e7efea19.tar.xz bind-0d4d38e853df420c67c08be272ec7456e7efea19.zip | |
fix for #216185: bind-chroot-admin able to change root mode 750
| -rw-r--r-- | bind-chroot-admin.in | 24 | ||||
| -rw-r--r-- | bind.spec | 3 |
2 files changed, 14 insertions, 13 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index bdd4a1d..fc87221 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -78,24 +78,24 @@ function check_dirs() /bin/chmod 0640 /etc/sysconfig/named; fi /bin/mkdir -p ${BIND_DIR}/{slaves,data}; - /bin/chown root:named ${BIND_DIR}; - /bin/chown named:named ${BIND_DIR}/{slaves,data}; - /bin/chmod 750 ${BIND_DIR} - /bin/chmod 770 ${BIND_DIR}/{slaves,data}; + /bin/chown --preserve-root root:named ${BIND_DIR}; + /bin/chown --preserve-root named:named ${BIND_DIR}/{slaves,data}; + /bin/chmod --preserve-root 750 ${BIND_DIR} + /bin/chmod --preserve-root 770 ${BIND_DIR}/{slaves,data}; mkdir -p ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run/named,named/{slaves,data}}}; - /bin/chown root:named ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run,named/}}; - /bin/chown root:named ${BIND_CHROOT_PREFIX}/var; - /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}}; - /bin/chown named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}}; - /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}}; + /bin/chown --preserve-root root:named ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run,named/}}; + /bin/chown --preserve-root root:named ${BIND_CHROOT_PREFIX}/var; + /bin/chmod --preserve-root 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}}; + /bin/chown --preserve-root named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}}; + /bin/chmod --preserve-root 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}}; [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 [ ! -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}/etc/localtime" ] && [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime"; - chown root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; - chmod 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; + /bin/chown --preserve-root root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; + /bin/chmod --preserve-root 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; if selinux_enabled && [ -x /usr/bin/chcon ]; then for dev in random zero null; do /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev; @@ -321,4 +321,4 @@ case $1 in *) usage; exit 1; -esac
\ No newline at end of file +esac @@ -447,7 +447,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.144 2006/11/21 12:39:58 stransky Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.145 2006/11/21 16:33:52 stransky Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -779,6 +779,7 @@ rm -rf ${RPM_BUILD_ROOT} * Fri Nov 21 2006 Martin Stransky <stransky@redhat.com> - 31:9.3.3-0.1.rc3 - added back an interval to restart - renamed package, it should meet the N-V-R criteria +- fix for #216185: bind-chroot-admin able to change root mode 750 * Mon Oct 30 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-6 - fix for #200465: named-checkzone and co. cannot be run as non-root user |