Collect the return values of both smbd and nmbd and return with exit status of

either of them if one is failing.

PR:		ports/151173
Submitted by:	uqs
Approved by:	maintainer timeout (3 months)
Feature safe:	yes
This commit is contained in:
Ulrich Spörlein 2011-01-30 11:19:39 +00:00
parent 8400e4cf70
commit c9f2927883
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=268419
2 changed files with 9 additions and 2 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= samba34
PORTVERSION= 3.4.9
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions rc pre

View file

@ -137,7 +137,7 @@ samba_reload_cmd() {
}
samba_cmd() {
local name rcvar command pidfile samba_daemons
local name rcvar command pidfile samba_daemons result _result
# Prevent recursive calling
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
# Stop processes in the reverse to order
@ -145,6 +145,7 @@ samba_cmd() {
samba_daemons=$(reverse_list ${samba_daemons})
fi
# Apply to all daemons
result=0
for name in ${samba_daemons}; do
rcvar=$(set_rcvar)
command="%%PREFIX%%/sbin/${name}"
@ -152,8 +153,14 @@ samba_cmd() {
# Daemon should be enabled and running
if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
# Collect return values
_result=$?
if [ ${_result} != 0 ]; then
result=${_result}
fi
fi
done
return $result
}
run_rc_command "$1"