View | Details | Raw Unified | Return to bug 57310 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/lib/univention-install/96univention-samba4.inst-orig (-7 / +7 lines)
Lines 207-212 Link Here
207
207
208
stop_conflicting_services() {
208
stop_conflicting_services() {
209
	## stop samba3 services and heimdal-kdc if present
209
	## stop samba3 services and heimdal-kdc if present
210
	if [ -x /etc/init.d/winbind ]; then
211
		if [ -n "$(pgrep -f /usr/sbin/winbindd)" ]; then
212
			/etc/init.d/winbind stop
213
			# Bug #35600: Really stop all winbind processes
214
			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/winbindd
215
		fi
216
	fi
210
	if [ -x /etc/init.d/samba ]; then
217
	if [ -x /etc/init.d/samba ]; then
211
		if [ -n "$(pgrep -f '/usr/sbin/(smbd|nmbd)')" ]; then
218
		if [ -n "$(pgrep -f '/usr/sbin/(smbd|nmbd)')" ]; then
212
			/etc/init.d/samba stop
219
			/etc/init.d/samba stop
Lines 214-226 Link Here
214
			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/smbd
221
			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/smbd
215
		fi
222
		fi
216
	fi
223
	fi
217
	if [ -x /etc/init.d/winbind ]; then
218
		if [ -n "$(pgrep -xf /usr/sbin/winbindd)" ]; then
219
			/etc/init.d/winbind stop
220
			# Bug #35600: Really stop all winbind processes
221
			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/winbindd
222
		fi
223
	fi
224
	if [ -x /etc/init.d/heimdal-kdc ]; then
224
	if [ -x /etc/init.d/heimdal-kdc ]; then
225
		if [ -n "$(pgrep -f '/usr/lib/heimdal-servers/(kdc|kpasswdd)')" ]; then
225
		if [ -n "$(pgrep -f '/usr/lib/heimdal-servers/(kdc|kpasswdd)')" ]; then
226
			/etc/init.d/heimdal-kdc stop
226
			/etc/init.d/heimdal-kdc stop

Return to bug 57310