View | Details | Raw Unified | Return to bug 151173
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=		samba34
8
PORTNAME=		samba34
9
PORTVERSION=		3.4.8
9
PORTVERSION=		3.4.8
10
PORTREVISION?=		1
10
PORTREVISION?=		2
11
CATEGORIES?=		net
11
CATEGORIES?=		net
12
MASTER_SITES=		${MASTER_SITE_SAMBA}
12
MASTER_SITES=		${MASTER_SITE_SAMBA}
13
MASTER_SITE_SUBDIR=	. old-versions rc pre
13
MASTER_SITE_SUBDIR=	. old-versions rc pre
(-)files/samba.in (-1 / +8 lines)
Lines 137-143 samba_reload_cmd() { Link Here
137
}
137
}
138
138
139
samba_cmd() {
139
samba_cmd() {
140
    local name rcvar command pidfile samba_daemons
140
    local name rcvar command pidfile samba_daemons result _result
141
    # Prevent recursive calling
141
    # Prevent recursive calling
142
    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
142
    unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
143
    # Stop processes in the reverse to order
143
    # Stop processes in the reverse to order
Lines 145-150 samba_cmd() { Link Here
145
	samba_daemons=$(reverse_list ${samba_daemons})
145
	samba_daemons=$(reverse_list ${samba_daemons})
146
    fi
146
    fi
147
    # Apply to all daemons
147
    # Apply to all daemons
148
    result=0
148
    for name in ${samba_daemons}; do
149
    for name in ${samba_daemons}; do
149
	rcvar=$(set_rcvar)
150
	rcvar=$(set_rcvar)
150
	command="%%PREFIX%%/sbin/${name}"
151
	command="%%PREFIX%%/sbin/${name}"
Lines 152-159 samba_cmd() { Link Here
152
	# Daemon should be enabled and running
153
	# Daemon should be enabled and running
153
	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
154
	if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
154
	    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
155
	    run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
156
	    # Collect return values
157
	    _result=$?
158
	    if [ ${_result} != 0 ]; then
159
		result=${_result}
160
	    fi
155
	fi
161
	fi
156
    done
162
    done
163
    return $result
157
}
164
}
158
165
159
run_rc_command "$1"
166
run_rc_command "$1"

Return to bug 151173