diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-13 10:03:57 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-13 10:03:57 +1100 |
| commit | ae507f620ae34b69c5df86980ea6e374c9c1e548 (patch) | |
| tree | c2669a72121c02ecc2d1e4aee16a3129960a5c66 /source3/libnet | |
| parent | dfbaf79a1b7455a0eef61813e07cb661cf17e995 (diff) | |
| parent | 4a1b50afd567313cc25d5bbc14e01e170aa62a00 (diff) | |
| download | samba-ae507f620ae34b69c5df86980ea6e374c9c1e548.tar.gz samba-ae507f620ae34b69c5df86980ea6e374c9c1e548.tar.bz2 samba-ae507f620ae34b69c5df86980ea6e374c9c1e548.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libnet')
| -rw-r--r-- | source3/libnet/libnet_join.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 8c3030711b..aa5f54adaf 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -789,6 +789,7 @@ static NTSTATUS libnet_join_joindomain_rpc_unsecure(TALLOC_CTX *mem_ctx, E_md4hash(trust_passwd, orig_trust_passwd_hash); status = rpccli_netlogon_set_trust_password(pipe_hnd, mem_ctx, + r->in.machine_name, orig_trust_passwd_hash, r->in.machine_password, new_trust_passwd_hash, |