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

Initscript should terminate only the correct "named" process (#622785).

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2011-01-05 12:58:29 +01:00
parent a0a60a6bd5
commit f214e0843b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bind.spec
View File

@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: ISC License: ISC
Version: 9.7.2 Version: 9.7.2
Release: 9.%{PATCHVER}%{?dist} Release: 10.%{PATCHVER}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -766,6 +766,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif %endif
%changelog %changelog
* Wed Jan 05 2011 Adam Tkac <atkac redhat com> 32:9.7.2-10.P3
- initscript should terminate only the correct "named" process (#622785)
* Mon Dec 20 2010 Adam Tkac <atkac redhat com> 32:9.7.2-9.P3 * Mon Dec 20 2010 Adam Tkac <atkac redhat com> 32:9.7.2-9.P3
- fix "krb5-self" update-policy rule processing - fix "krb5-self" update-policy rule processing

15
named.init
View File

@ -84,6 +84,10 @@ umount_chroot_conf()
done done
} }
pidofnamed() {
pidofproc -p "$ROOTDIR/var/run/named/named.pid" "$named";
}
# Check if all what named needs running # Check if all what named needs running
start() start()
{ {
@ -118,7 +122,7 @@ start()
# all pre-start is done, lets start named # all pre-start is done, lets start named
echo -n $"Starting named: " echo -n $"Starting named: "
if [ -n "`/sbin/pidof -o %PPID "$named"`" ]; then if [ -n "`pidofnamed`" ]; then
echo -n $"named: already running" echo -n $"named: already running"
success success
echo echo
@ -136,7 +140,7 @@ start()
# check if configuration is correct # check if configuration is correct
if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then
daemon /usr/sbin/"$named" -u named ${OPTIONS}; daemon --pidfile "$ROOTDIR/var/run/named/named.pid" /usr/sbin/"$named" -u named ${OPTIONS};
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
rm -f /var/run/{named,named-sdb}.pid; rm -f /var/run/{named,named-sdb}.pid;
@ -172,11 +176,12 @@ stop() {
[ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1; [ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1;
RETVAL=$? RETVAL=$?
# was rndc successful? # was rndc successful?
[ "$RETVAL" -eq 0 ] || killproc "$named" -TERM >/dev/null 2>&1 [ "$RETVAL" -eq 0 ] || \\
killproc -p "$ROOTDIR/var/run/named/named.pid" "$named" -TERM >/dev/null 2>&1
timeout=0 timeout=0
RETVAL=0 RETVAL=0
while /sbin/pidof -o %PPID "$named" >/dev/null; do while pidofnamed >/dev/null; do
if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
RETVAL=1 RETVAL=1
break break
@ -218,7 +223,7 @@ reload() {
[ "$EUID" != "0" ] && exit [ "$EUID" != "0" ] && exit
echo -n $"Reloading "$named": " echo -n $"Reloading "$named": "
p=`/sbin/pidof -o %PPID "$named"` p=`pidofnamed`
RETVAL=$? RETVAL=$?
if [ "$RETVAL" -eq 0 ]; then if [ "$RETVAL" -eq 0 ]; then
/usr/sbin/rndc reload >/dev/null 2>&1 || /bin/kill -HUP $p; /usr/sbin/rndc reload >/dev/null 2>&1 || /bin/kill -HUP $p;