diff options
| author | Alexander Bokovoy <ab@samba.org> | 2007-12-13 12:57:24 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2007-12-13 12:57:24 +0300 |
| commit | e25383400af26f10baff4d2b21db63f528ffbaeb (patch) | |
| tree | 0a2cb2762299cb187456e8f5bff0de5c3886a861 /source3/auth/auth_domain.c | |
| parent | ceedf1a111598c815ffef9a0fe312689cc4bf136 (diff) | |
| parent | 5db4a7f6c423bb5df8403e1b8737a4d80cee85ae (diff) | |
| download | samba-e25383400af26f10baff4d2b21db63f528ffbaeb.tar.gz samba-e25383400af26f10baff4d2b21db63f528ffbaeb.tar.xz samba-e25383400af26f10baff4d2b21db63f528ffbaeb.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01)
Diffstat (limited to 'source3/auth/auth_domain.c')
| -rw-r--r-- | source3/auth/auth_domain.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index 7cddabbbbd..b2c87174fd 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -127,8 +127,11 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result))); uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS; uint32 sec_chan_type = 0; unsigned char machine_pwd[16]; + const char *account_name; - if (!get_trust_pw(domain, machine_pwd, &sec_chan_type)) { + if (!get_trust_pw_hash(domain, machine_pwd, &account_name, + &sec_chan_type)) + { DEBUG(0, ("connect_to_domain_password_server: could not fetch " "trust account password for domain '%s'\n", domain)); @@ -142,7 +145,7 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result))); dc_name, /* server name */ domain, /* domain */ global_myname(), /* client name */ - global_myname(), /* machine account name */ + account_name, /* machine account name */ machine_pwd, sec_chan_type, &neg_flags); |