rpms/dhcp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Handle cases in add_timeout() where the function is called with a NULL

Browse Source 
value for the 'when' parameter (#506626)
- Fix SELinux denials in dhclient-script when the script makes backup
    configuration files and restores them later (#483747)
This commit is contained in:
David Cantrell 2009-06-27 03:17:04 +00:00
parent 70d67fc19e
commit 226011db1a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dhclient-script
View File

@ -57,7 +57,9 @@ save_previous() {
fi fi
if [ -e ${origfile} ]; then if [ -e ${origfile} ]; then
mv ${origfile} ${savefile} contents="$(< ${origfile})"
echo "${contents}" > ${savefile}
rm -f ${origfile}
else else
echo > ${savefile} echo > ${savefile}
fi fi
@ -483,7 +485,9 @@ case "${reason}" in
[[ "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ]]; then [[ "${DHCP_TIME_OFFSET_SETS_TIMEZONE}" = [yY1]* ]]; then
if [ -e ${SAVEDIR}/localtime.predhclient.${interface} ]; then if [ -e ${SAVEDIR}/localtime.predhclient.${interface} ]; then
rm -f /etc/localtime rm -f /etc/localtime
mv ${SAVEDIR}/localtime.predhclient.${interface} /etc/localtime contents="$(< ${SAVEDIR}/localtime.predhclient.${interface})"
echo "${contents}" > /etc/localtime
rm -f ${SAVEDIR}/localtime.predhclient.${interface}
touch /etc/localtime touch /etc/localtime
fix_context /etc/localtime fix_context /etc/localtime
fi fi

2
dhcp.spec
View File

@ -432,6 +432,8 @@ fi
* Fri Jun 26 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-21 * Fri Jun 26 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-21
- Handle cases in add_timeout() where the function is called with a NULL - Handle cases in add_timeout() where the function is called with a NULL
value for the 'when' parameter (#506626) value for the 'when' parameter (#506626)
- Fix SELinux denials in dhclient-script when the script makes backup
configuration files and restores them later (#483747)
* Wed May 06 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-20 * Wed May 06 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0-20
- Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290) - Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290)