diff -r 32f3115de203 -r ffcd2965c591 components/samba/samba/Solaris/winbind.xml
--- a/components/samba/samba/Solaris/winbind.xml	Mon Jun 11 04:08:45 2012 -0700
+++ b/components/samba/samba/Solaris/winbind.xml	Sat May 05 01:17:31 2012 -0700
@@ -23,7 +23,7 @@
 -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-	Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+	Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 
 	#ident	"@(#)winbind.xml	1.2	10/07/26 SMI"
 
@@ -72,11 +72,11 @@
 	</dependent>
 
 	<exec_method type='method' name='start'
-		exec='/usr/sbin/winbindd'
+		exec='/lib/svc/method/samba start /usr/sbin/winbindd -D'
 		timeout_seconds='60' />
 
 	<exec_method type='method' name='stop'
-		exec='/usr/bin/kill `/usr/bin/cat /var/samba/locks/winbindd.pid`'
+		exec='/lib/svc/method/samba stop %{restarter/contract}'
 		timeout_seconds='60' />
 
 	<stability value='Unstable' />