summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-04-03 19:08:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:53 -0500
commitd4ff03ae12d8682c42eb66d110df7d86f94cde23 (patch)
tree95d82aec99f7e6cf73d6add671c70dc67a620092 /source3
parent41c4c103979248c18928fe9fbf5a59532d85ff4e (diff)
downloadsamba-d4ff03ae12d8682c42eb66d110df7d86f94cde23.tar.gz
samba-d4ff03ae12d8682c42eb66d110df7d86f94cde23.tar.bz2
samba-d4ff03ae12d8682c42eb66d110df7d86f94cde23.zip
r14895: Merge the 3.0.22 change
(This used to be commit 62d60a04cd85dc521e7d63726b856f38287466ad)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd_cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 3c5062df59..9e450d9de7 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -294,7 +294,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
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,