summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-11-04 00:03:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:18 -0500
commit5678e4abb04e546735bff4907854ca32094a5b71 (patch)
tree239c2ef051fe584ca38e893c6e237e0547810239 /source3/utils
parente12eb25793606e4dba7d0d24cd4959209f5d8a30 (diff)
downloadsamba-5678e4abb04e546735bff4907854ca32094a5b71.tar.gz
samba-5678e4abb04e546735bff4907854ca32094a5b71.tar.bz2
samba-5678e4abb04e546735bff4907854ca32094a5b71.zip
r11492: Fix bug #3224 (I hope). Correctly use machine_account_name
and client_name when doing netlogon credential setup. Jeremy. (This used to be commit 37e6ef9389041f58eada167239fd022f01c5fecb)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_rpc_join.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 6b762563b3..12e51a85d1 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -303,9 +303,10 @@ int net_rpc_join_newstyle(int argc, const char **argv)
}
result = rpccli_netlogon_setup_creds(pipe_hnd,
- cli->desthost,
- domain,
- global_myname(),
+ cli->desthost, /* server name */
+ domain, /* domain */
+ global_myname(), /* client name */
+ global_myname(), /* machine account name */
md4_trust_password,
sec_channel_type,
&neg_flags);