--- /usr/lib/univention-install/96univention-samba4.inst-orig	2024-02-05 16:53:54.000000000 +0100
+++ /usr/lib/univention-install/96univention-samba4.inst	2024-07-02 15:37:14.044000000 +0200
@@ -207,6 +207,13 @@
 
 stop_conflicting_services() {
 	## stop samba3 services and heimdal-kdc if present
+	if [ -x /etc/init.d/winbind ]; then
+		if [ -n "$(pgrep -f /usr/sbin/winbindd)" ]; then
+			/etc/init.d/winbind stop
+			# Bug #35600: Really stop all winbind processes
+			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/winbindd
+		fi
+	fi
 	if [ -x /etc/init.d/samba ]; then
 		if [ -n "$(pgrep -f '/usr/sbin/(smbd|nmbd)')" ]; then
 			/etc/init.d/samba stop
@@ -214,13 +221,6 @@
 			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/smbd
 		fi
 	fi
-	if [ -x /etc/init.d/winbind ]; then
-		if [ -n "$(pgrep -xf /usr/sbin/winbindd)" ]; then
-			/etc/init.d/winbind stop
-			# Bug #35600: Really stop all winbind processes
-			start-stop-daemon --stop --quiet --retry 2 --exec /usr/sbin/winbindd
-		fi
-	fi
 	if [ -x /etc/init.d/heimdal-kdc ]; then
 		if [ -n "$(pgrep -f '/usr/lib/heimdal-servers/(kdc|kpasswdd)')" ]; then
 			/etc/init.d/heimdal-kdc stop