diff -u -r --new-file --exclude .svn --exclude CVS samba-3.0.21c/source/nsswitch/winbindd_cm.c samba-3.0.22/source/nsswitch/winbindd_cm.c
--- samba-3.0.21c/source/nsswitch/winbindd_cm.c	2006-01-30 12:38:49.000000000 -0600
+++ samba-3.0.22/source/nsswitch/winbindd_cm.c	2006-03-29 17:36:47.000000000 -0600
@@ -294,7 +294,7 @@
 
 		DEBUG(5, ("connecting to %s from %s with username "
 			  "[%s]\\[%s]\n",  controller, global_myname(),
-			  machine_account, machine_password));
+			  lp_workgroup(), machine_account));
 
 		ads_status = cli_session_setup_spnego(*cli,
 						      machine_account,