svn commit: samba r14895 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[vlendec at samba.org]

Author: vlendec
Date: 2006-04-03 19:08:23 +0000 (Mon, 03 Apr 2006)
New Revision: 14895

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14895

Log:
Merge the 3.0.22 change
Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   trunk/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-04-03 15:18:12 UTC (rev 14894)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-04-03 19:08:23 UTC (rev 14895)
@@ -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, 

Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2006-04-03 15:18:12 UTC (rev 14894)
+++ trunk/source/nsswitch/winbindd_cm.c	2006-04-03 19:08:23 UTC (rev 14895)
@@ -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,