*** /lib/rcscripts/sh/rc-daemon.sh.orig	2006-08-15 14:25:15.000000000 -0500
--- /lib/rcscripts/sh/rc-daemon.sh	2006-08-15 14:26:17.000000000 -0500
***************
*** 86,92 ****
  #
  # Setup our vars based on the start-stop-daemon command
  rc_setup_daemon_vars() {
! 	local name i
  	local -a sargs=( "${args%% \'--\' *}" )
  	local -a eargs
  	local x="${args// \'--\' /}"
--- 86,92 ----
  #
  # Setup our vars based on the start-stop-daemon command
  rc_setup_daemon_vars() {
! 	local i
  	local -a sargs=( "${args%% \'--\' *}" )
  	local -a eargs
  	local x="${args// \'--\' /}"
***************
*** 194,219 ****
  	eval /bin/pidof -x ${args}
  }
  
! # bool is_daemon_running(char* cmd, char* pidfile)
  #
  # Returns 0 if the given daemon is running, otherwise 1
  # If a pidfile is supplied, the pid inside it must match
! # a pid in the list of pidof ${cmd}
  is_daemon_running() {
! 	local cmd pidfile pids pid
  
  	if [[ $# == "1" ]]; then
! 		cmd="$1"
  	else
  		local i j="$#"
  		for (( i=0; i<j-1; i++ )); do
! 			cmd="${cmd} $1"
  			shift
  		done
  		pidfile="$1"
  	fi
  
! 	pids="$( pidof ${cmd} )"
  	[[ -z ${pids} ]] && return 1
  
  	[[ -s ${pidfile} ]] || return 0
--- 194,219 ----
  	eval /bin/pidof -x ${args}
  }
  
! # bool is_daemon_running(char* name, char* pidfile)
  #
  # Returns 0 if the given daemon is running, otherwise 1
  # If a pidfile is supplied, the pid inside it must match
! # a pid in the list of pidof ${name}
  is_daemon_running() {
! 	local name pidfile pids pid
  
  	if [[ $# == "1" ]]; then
! 		name="$1"
  	else
  		local i j="$#"
  		for (( i=0; i<j-1; i++ )); do
! 			name="${name} $1"
  			shift
  		done
  		pidfile="$1"
  	fi
  
! 	pids="$( pidof ${name} )"
  	[[ -z ${pids} ]] && return 1
  
  	[[ -s ${pidfile} ]] || return 0
***************
*** 239,245 ****
  	# Seems to be only daemons that do not create pid files though ...
  	local i=0
  	for ((i=0; i<10; i++)); do
! 		is_daemon_running ${cmd} "${pidfile}" && break
  		LC_ALL=C /bin/sleep "0.1"
  	done
  
--- 239,245 ----
  	# Seems to be only daemons that do not create pid files though ...
  	local i=0
  	for ((i=0; i<10; i++)); do
! 		is_daemon_running ${name} "${pidfile}" && break
  		LC_ALL=C /bin/sleep "0.1"
  	done
  
***************
*** 248,254 ****
  	# to handle daemons who launch and then fail due to invalid
  	# configuration files
  	LC_ALL=C /bin/sleep "${RC_WAIT_ON_START}"
! 	is_daemon_running ${cmd} "${pidfile}"
  	retval="$?"
  	[[ ${retval} == "0" ]] && return 0
  
--- 248,254 ----
  	# to handle daemons who launch and then fail due to invalid
  	# configuration files
  	LC_ALL=C /bin/sleep "${RC_WAIT_ON_START}"
! 	is_daemon_running ${name} "${pidfile}"
  	retval="$?"
  	[[ ${retval} == "0" ]] && return 0
  
***************
*** 266,276 ****
  rc_stop_daemon() {
  	local pid pids retval="0"
  	
! 	if [[ -n ${cmd} ]]; then
! 		if ! is_daemon_running ${cmd} "${pidfile}" ; then
  			[[ ${RC_FAIL_ON_ZOMBIE} == "yes" ]] && return 1
  		fi
! 		pids="$( pidof ${cmd} )"
  	fi
  
  	if [[ -s ${pidfile} ]]; then
--- 266,276 ----
  rc_stop_daemon() {
  	local pid pids retval="0"
  	
! 	if [[ -n ${name} ]]; then
! 		if ! is_daemon_running ${name} "${pidfile}" ; then
  			[[ ${RC_FAIL_ON_ZOMBIE} == "yes" ]] && return 1
  		fi
! 		pids="$( pidof ${name} )"
  	fi
  
  	if [[ -s ${pidfile} ]]; then